The Android Automerger
1c373f0b14
merge in klp-release history after reset to master
2013-07-24 06:02:02 -07:00
Geremy Condra
63ac2f7d54
Merge "Fix default DNS not being set on network changes"
2013-07-24 00:32:34 +00:00
Chad Brubaker
73652d07b8
Fix default DNS not being set on network changes
...
Change-Id: I3c45404cab34c77b20dadc1d8aee127aa08fd0bd
2013-07-23 17:13:36 -07:00
Geremy Condra
3092b8e931
Merge "Fix supplimentary network connections with VPNs"
2013-07-23 17:58:33 +00:00
Geremy Condra
50e914ff34
Merge "Support multiple Vpn ManageDialogs"
2013-07-23 17:55:45 +00:00
The Android Automerger
6d43de7118
merge in klp-release history after reset to master
2013-07-22 06:01:44 -07:00
Guang Zhu
a5e56e1223
fix build
...
Change-Id: Ie4bd7c3fe9320d22b7da2962e5e5a4abca510bd2
2013-07-21 02:01:34 -07:00
The Android Open Source Project
9c594437df
am 10a4c0a6: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit '10a4c0a65a28155748956915b6f58fd201b7c901':
Add gservices updater for carrier provisioning url
Cleaner Tejat notification in Audio Package 11
When a SIM is changed check mobile provisioning.
Fix missing lock in power manager.
Remove iterators (DO NOT MERGE)
2013-07-19 16:02:25 -07:00
Chad Brubaker
49db422100
Fix supplimentary network connections with VPNs
...
Enables the use of supplimentary mobile networks like MMS, and HIPRI
while VPNs are running.
Change-Id: I313f57a905b4e16bd4322c68687cbff1cfbe9d3e
2013-07-19 15:57:05 -07:00
Robert Greenwalt
f68291a419
resolved conflicts for merge of eb98d8f6 to master
...
Change-Id: Ia9509ab6897e27da8bf4fc61a4140f2f93acb80f
2013-07-19 14:30:49 -07:00
The Android Open Source Project
10a4c0a65a
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: I1d7f0e0f6a4cb8b9363c99a830dc1656424ad49d
2013-07-19 14:20:43 -07:00
Robert Greenwalt
8636128e2c
resolved conflicts for merge of 22069565 to master
...
Change-Id: Idd0ad9b1504fddf68c4c4cc04731de1eddd204b3
2013-07-19 14:09:30 -07:00
Wink Saville
5ada2f6941
am 790ac470: am df43ba82: am e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
...
* commit '790ac470fe3226d10b6eeae707054b102095c284':
When a SIM is changed check mobile provisioning.
2013-07-19 13:42:36 -07:00
Robert Greenwalt
eb98d8f65f
am ddf17b5b: am 8c87b297: Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev
...
* commit 'ddf17b5b82f25965502377588483abbc328c4e6d':
Make CS.isTetheringSupported dynamic
2013-07-19 13:37:58 -07:00
Robert Greenwalt
220695650f
am b5bf655c: am 1497d485: Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
...
* commit 'b5bf655cc6cc9128aec99958cce3b054348c9273':
Add gservices updater for carrier provisioning url
2013-07-19 13:37:41 -07:00
Wink Saville
790ac470fe
am df43ba82: am e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev
...
* commit 'df43ba82e6c232985a95c9827f7d71dd3194e0a8':
When a SIM is changed check mobile provisioning.
2013-07-19 13:37:35 -07:00
Wink Saville
c2d87fb435
Merge "checkMobileProvisioning is not using sendNotification."
2013-07-19 17:14:41 +00:00
Wink Saville
99fedebaa1
checkMobileProvisioning is not using sendNotification.
...
Change-Id: Ie5b98b462b29fe9339fcb8207d2d33e3028a155c
2013-07-19 09:27:56 -07:00
Christopher Tate
98b10cec42
Fix build & preserve DHCP scheduling as-is
...
Change-Id: I4063b18532c476280f343658bf3641495e526ed4
2013-07-18 18:23:57 -07:00
Robert Greenwalt
368095f658
Make CS.isTetheringSupported dynamic
...
It used to be set at boot, but that was too quick to pick up carrier
specific resources. With this change even if you switch sims subequent
checks get the new values.
bug:9865616
Change-Id: I8c270c6b02fc6bdd3c3d76ceea58172df25e058d
2013-07-18 14:24:42 -07:00
Robert Greenwalt
a01ffe6f38
Add gservices updater for carrier provisioning url
...
bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
2013-07-18 11:24:56 -07:00
The Android Automerger
596c10b9e3
merge in klp-release history after reset to master
2013-07-18 06:01:57 -07:00
Robert Greenwalt
1497d4854d
Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
2013-07-17 23:46:25 +00:00
Wink Saville
5ba1b91400
When a SIM is changed check mobile provisioning.
...
A simple mechanism for doing this is to take advantage of the fact
that we require the device to reboot after a sim has been changed.
Thus when connectivity service is started we wait to get a connection
then call checkMobileProvisioning once. We also add a check that
the DEVICE_PROVISIONED is true, i.e. SetupWizard has been run.
Bug: 9784024
Change-Id: I5c1936744f6fc55a447ae44cd36eec3849d27e21
2013-07-17 14:59:20 -07:00
Robert Greenwalt
39d560174e
Add gservices updater for carrier provisioning url
...
bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
2013-07-17 14:05:33 -07:00
Chad Brubaker
94f3c8c66d
Support multiple Vpn ManageDialogs
...
Move away from storing the configs in the Intent to prevent issues with
PendingIntents and multiple configs.
The Dialog now queries ConnectivityService for the configuration to
display in the management dialog.
Change-Id: I0e0ef52db840152914d117a24f776d8106e836ff
2013-07-16 18:59:12 -07:00
Wink Saville
f0e9c7fc7f
When a SIM is changed check mobile provisioning.
...
A simple mechanism for doing this is to take advantage of the fact
that we require the device to reboot after a sim has been changed.
Thus when connectivity service is started we wait to get a connection
then call checkMobileProvisioning once. We also add a check that
the DEVICE_PROVISIONED is true, i.e. SetupWizard has been run.
Bug: 9784024
Change-Id: I5c1936744f6fc55a447ae44cd36eec3849d27e21
2013-07-16 17:16:37 -07:00
Chad Brubaker
dc7e3ee3ad
Move markSocketAsUser to the top of IConnectivityManager.aidl
...
Move markSocketAsUser to the top of IConnectivityManager.aidl to make
calls from
framework/native/services/connectivitymanager less fragile
Change-Id: Iba92c21dfef175b570521f34e7ee2732e5a0a9c9
2013-07-16 11:29:11 -07:00
The Android Automerger
ac6cc2b39f
merge in klp-release history after reset to master
2013-07-16 06:01:24 -07:00
Geremy Condra
95a46facdc
Merge "Support routing sockets as another user"
2013-07-15 21:57:18 +00:00
Geremy Condra
13d27ad029
Merge changes Ia6646363,I94389b64
...
* changes:
Add per user VPN support
Add NetworkUtil function for marking sockets
2013-07-15 21:56:30 +00:00
Chad Brubaker
11f2225c3d
Support routing sockets as another user
...
Add support for routing sockets as if they were another user's.
This is for services that handle delegated network tasks like MediaServer and DownloadManager.
Change-Id: Id20efc1f5c2cce6f8838d777762f6c0a703a9437
2013-07-15 12:14:10 -07:00
The Android Open Source Project
b7542fabf1
am 8fa2968a: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit '8fa2968a902e5e6128c6c0827ffa500c1cc53eb7':
2013-07-15 09:37:54 -07:00
The Android Open Source Project
8fa2968a90
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: Ib08f5c3c72f9d6eee571e7f9dff130abadffbbec
2013-07-15 09:32:49 -07:00
The Android Automerger
1189716ffc
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-07-15 08:19:11 -07:00
The Android Automerger
8bc4746bcf
merge in klp-release history after reset to master
2013-07-15 06:01:32 -07:00
Chad Brubaker
b7652cde9d
Add per user VPN support
...
VPNs are now per user instead of global. A VPN set by user A routes only
user A's traffic and no other user can access it.
Change-Id: Ia66463637b6bd088b05768076a1db897fe95c46c
2013-07-12 20:51:03 -07:00
Chad Brubaker
3f3b4e6462
Add NetworkUtil function for marking sockets
...
Add NetworkUtil function for setting the SO_MARK field of sockets
Change-Id: I94389b64296d87ee928293f24a26f8dd08c3bf37
2013-07-12 19:48:32 +00:00
Wink Saville
a77b479408
am ef942e8a: am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
...
* commit 'ef942e8a558f9add67848f45d5191da0a45a1948':
VZW wants the phoneNumber to be 10 zero's if there isn't one.
2013-07-12 12:14:01 -07:00
Wink Saville
ef942e8a55
am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
...
* commit '42a85412d12078f36c3fdeda1211bdc3800bab0c':
VZW wants the phoneNumber to be 10 zero's if there isn't one.
2013-07-12 12:03:53 -07:00
Wink Saville
c118d7efab
VZW wants the phoneNumber to be 10 zero's if there isn't one.
...
Bug: 9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859
2013-07-10 23:00:07 -07:00
The Android Automerger
72f26b2332
merge in klp-release history after reset to master
2013-07-09 06:00:45 -07:00
The Android Open Source Project
c44981dca2
am 5b734503: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit '5b734503a42beab7cc8d74d4fff20996cb6b5cb2':
2013-07-08 15:52:24 -07:00
The Android Open Source Project
5b734503a4
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: Id0d9eb3205906b409e735546b988f43a3bdcc0ae
2013-07-08 15:33:43 -07:00
The Android Automerger
1690bbfe2c
merge in klp-release history after reset to master
2013-07-08 06:00:54 -07:00
The Android Automerger
b592da977a
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-07-08 05:55:31 -07:00
The Android Open Source Project
0927e678c1
am 8b686347: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
* commit '8b686347266e79c32b33b0660731423ec9a9891d':
Expose latency methods through AudioManager and AudioTrack.
Fix NPE if mobile is not supported in checkMobileProvisioning.
Temporarily disable 'Scan Always' mode
2013-07-03 08:53:48 -07:00
The Android Open Source Project
8b68634726
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
Change-Id: I343bd8f6d948c90cd5cede9dc160c86ebce6501c
2013-07-03 08:51:11 -07:00
Wink Saville
3730207465
am 6152916c: am db011499: am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev
...
* commit '6152916c450942c6eeae8270eb2aed9a16639295':
Fix NPE if mobile is not supported in checkMobileProvisioning.
2013-07-02 15:56:45 -07:00
Wink Saville
b0a3f08942
am 6152916c: am db011499: am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev
...
* commit '6152916c450942c6eeae8270eb2aed9a16639295':
Fix NPE if mobile is not supported in checkMobileProvisioning.
2013-07-02 12:41:31 -07:00