4,287 commits

This branch

This branch

All branches

Message	SHA1
merge in klp-release history after reset to master The Android Automerger   commited 2013-07-24 06:02:02 -07:00	1c373f0b14
Remove unused mDnsOverridden ... mDnsOverridden is no longer used now that VPNs do not override the default DNS settings. Change-Id: I69495b9a6de7d60628813f357d3dbdf548695ada Chad Brubaker   commited 2013-07-23 17:49:37 -07:00	5fdc14656c
Merge "Fix default DNS not being set on network changes" Geremy Condra   authored and   Android (Google) Code Review   commited 2013-07-24 00:32:34 +00:00	63ac2f7d54
Fix default DNS not being set on network changes ... Change-Id: I3c45404cab34c77b20dadc1d8aee127aa08fd0bd Chad Brubaker   commited 2013-07-23 17:13:36 -07:00	73652d07b8
Merge "Fix supplimentary network connections with VPNs" Geremy Condra   authored and   Android (Google) Code Review   commited 2013-07-23 17:58:33 +00:00	3092b8e931
Merge "Support multiple Vpn ManageDialogs" Geremy Condra   authored and   Android (Google) Code Review   commited 2013-07-23 17:55:45 +00:00	50e914ff34
merge in klp-release history after reset to master The Android Automerger   commited 2013-07-22 06:01:44 -07:00	6d43de7118
fix build ... Change-Id: Ie4bd7c3fe9320d22b7da2962e5e5a4abca510bd2 Guang Zhu   commited 2013-07-21 02:01:34 -07:00	a5e56e1223
am 10a4c0a6: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge ... * commit '10a4c0a65a': 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) The Android Open Source Project   authored and   Android Git Automerger   commited 2013-07-19 16:02:25 -07:00	9c594437df
Fix supplimentary network connections with VPNs ... Enables the use of supplimentary mobile networks like MMS, and HIPRI while VPNs are running. Change-Id: I313f57a905b4e16bd4322c68687cbff1cfbe9d3e Chad Brubaker   commited 2013-07-19 15:57:05 -07:00	49db422100
resolved conflicts for merge of eb98d8f6 to master ... Change-Id: Ia9509ab6897e27da8bf4fc61a4140f2f93acb80f Robert Greenwalt   commited 2013-07-19 14:30:49 -07:00	f68291a419
Reconcile with jb-mr2-zeroday-release - do not merge ... Change-Id: I1d7f0e0f6a4cb8b9363c99a830dc1656424ad49d The Android Open Source Project   commited 2013-07-19 14:20:43 -07:00	10a4c0a65a
resolved conflicts for merge of 22069565 to master ... Change-Id: Idd0ad9b1504fddf68c4c4cc04731de1eddd204b3 Robert Greenwalt   commited 2013-07-19 14:09:30 -07:00	8636128e2c
am 790ac470: am df43ba82: am e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev ... * commit '790ac470fe': When a SIM is changed check mobile provisioning. Wink Saville   authored and   Android Git Automerger   commited 2013-07-19 13:42:36 -07:00	5ada2f6941
am ddf17b5b: am 8c87b297: Merge "Make CS.isTetheringSupported dynamic" into jb-mr2-dev ... * commit 'ddf17b5b82f25965502377588483abbc328c4e6d': Make CS.isTetheringSupported dynamic Robert Greenwalt   authored and   Android Git Automerger   commited 2013-07-19 13:37:58 -07:00	eb98d8f65f
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 Robert Greenwalt   authored and   Android Git Automerger   commited 2013-07-19 13:37:41 -07:00	220695650f
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. Wink Saville   authored and   Android Git Automerger   commited 2013-07-19 13:37:35 -07:00	790ac470fe
Merge "checkMobileProvisioning is not using sendNotification." Wink Saville   authored and   Android (Google) Code Review   commited 2013-07-19 17:14:41 +00:00	c2d87fb435
checkMobileProvisioning is not using sendNotification. ... Change-Id: Ie5b98b462b29fe9339fcb8207d2d33e3028a155c Wink Saville   commited 2013-07-19 09:27:56 -07:00	99fedebaa1
Fix build & preserve DHCP scheduling as-is ... Change-Id: I4063b18532c476280f343658bf3641495e526ed4 Christopher Tate   commited 2013-07-18 18:23:57 -07:00	98b10cec42
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 Robert Greenwalt   commited 2013-07-18 14:24:42 -07:00	368095f658
Add gservices updater for carrier provisioning url ... bug:9623159 Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1 Robert Greenwalt   authored and   The Android Automerger   commited 2013-07-18 11:24:56 -07:00	a01ffe6f38
merge in klp-release history after reset to master The Android Automerger   commited 2013-07-18 06:01:57 -07:00	596c10b9e3
Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev Robert Greenwalt   authored and   Android (Google) Code Review   commited 2013-07-17 23:46:25 +00:00	1497d4854d
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 Wink Saville   authored and   The Android Automerger   commited 2013-07-17 14:59:20 -07:00	5ba1b91400
Add gservices updater for carrier provisioning url ... bug:9623159 Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1 Robert Greenwalt   commited 2013-07-17 14:05:33 -07:00	39d560174e
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 Chad Brubaker   commited 2013-07-16 18:59:12 -07:00	94f3c8c66d
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 Wink Saville   commited 2013-07-16 17:16:37 -07:00	f0e9c7fc7f
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 Chad Brubaker   commited 2013-07-16 11:29:11 -07:00	dc7e3ee3ad
merge in klp-release history after reset to master The Android Automerger   commited 2013-07-16 06:01:24 -07:00	ac6cc2b39f
Merge "Support routing sockets as another user" Geremy Condra   authored and   Android (Google) Code Review   commited 2013-07-15 21:57:18 +00:00	95a46facdc
Merge changes Ia6646363,I94389b64 ... * changes: Add per user VPN support Add NetworkUtil function for marking sockets Geremy Condra   authored and   Android (Google) Code Review   commited 2013-07-15 21:56:30 +00:00	13d27ad029
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 Chad Brubaker   commited 2013-07-15 12:14:10 -07:00	11f2225c3d
am 8fa2968a: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge ... * commit '8fa2968a90': The Android Open Source Project   authored and   Android Git Automerger   commited 2013-07-15 09:37:54 -07:00	b7542fabf1
Reconcile with jb-mr2-zeroday-release - do not merge ... Change-Id: Ib08f5c3c72f9d6eee571e7f9dff130abadffbbec The Android Open Source Project   commited 2013-07-15 09:32:49 -07:00	8fa2968a90
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev The Android Automerger   commited 2013-07-15 08:19:11 -07:00	1189716ffc
merge in klp-release history after reset to master The Android Automerger   commited 2013-07-15 06:01:32 -07:00	8bc4746bcf
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 Chad Brubaker   commited 2013-07-12 20:51:03 -07:00	b7652cde9d
Add NetworkUtil function for marking sockets ... Add NetworkUtil function for setting the SO_MARK field of sockets Change-Id: I94389b64296d87ee928293f24a26f8dd08c3bf37 Chad Brubaker   authored and   Geremy Condra   commited 2013-07-12 19:48:32 +00:00	3f3b4e6462
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 'ef942e8a55': VZW wants the phoneNumber to be 10 zero's if there isn't one. Wink Saville   authored and   Android Git Automerger   commited 2013-07-12 12:14:01 -07:00	a77b479408
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. Wink Saville   authored and   Android Git Automerger   commited 2013-07-12 12:03:53 -07:00	ef942e8a55
VZW wants the phoneNumber to be 10 zero's if there isn't one. ... Bug: 9784059 Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859 Wink Saville   commited 2013-07-10 23:00:07 -07:00	c118d7efab
merge in klp-release history after reset to master The Android Automerger   commited 2013-07-09 06:00:45 -07:00	72f26b2332
am 5b734503: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge ... * commit '5b734503a4': The Android Open Source Project   authored and   Android Git Automerger   commited 2013-07-08 15:52:24 -07:00	c44981dca2
Reconcile with jb-mr2-zeroday-release - do not merge ... Change-Id: Id0d9eb3205906b409e735546b988f43a3bdcc0ae The Android Open Source Project   commited 2013-07-08 15:33:43 -07:00	5b734503a4
merge in klp-release history after reset to master The Android Automerger   commited 2013-07-08 06:00:54 -07:00	1690bbfe2c
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev The Android Automerger   commited 2013-07-08 05:55:31 -07:00	b592da977a
am 8b686347: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge ... * commit '8b68634726': Expose latency methods through AudioManager and AudioTrack. Fix NPE if mobile is not supported in checkMobileProvisioning. Temporarily disable 'Scan Always' mode The Android Open Source Project   authored and   Android Git Automerger   commited 2013-07-03 08:53:48 -07:00	0927e678c1
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge ... Change-Id: I343bd8f6d948c90cd5cede9dc160c86ebce6501c The Android Open Source Project   commited 2013-07-03 08:51:11 -07:00	8b68634726
am 6152916c: am db011499: am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev ... * commit '6152916c45': Fix NPE if mobile is not supported in checkMobileProvisioning. Wink Saville   authored and   The Android Automerger   commited 2013-07-02 15:56:45 -07:00	3730207465