LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
929 Commits 2 Branches 0 Tags
c6c5161c338a0d2a097e2808dfd59182a82dc6cb
Commit Graph

929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
c6c5161c33 merge in klp-release history after reset to master 2013-07-22 06:01:44 -07:00
Guang Zhu
f466bf9e1d fix build 
Change-Id: Ie4bd7c3fe9320d22b7da2962e5e5a4abca510bd2
 2013-07-21 02:01:34 -07:00
The Android Open Source Project
b91b601f3e am 7d0a85e2: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit '7d0a85e2133fabd47f0f952f3f91dfcdd01f3881':
  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
Robert Greenwalt
00eb17fb05 resolved conflicts for merge of 64031ab2 to master 
Change-Id: Ia9509ab6897e27da8bf4fc61a4140f2f93acb80f
 2013-07-19 14:30:49 -07:00
The Android Open Source Project
7d0a85e213 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I1d7f0e0f6a4cb8b9363c99a830dc1656424ad49d
 2013-07-19 14:20:43 -07:00
Robert Greenwalt
1bf31d7571 resolved conflicts for merge of 248d8d2c to master 
Change-Id: Idd0ad9b1504fddf68c4c4cc04731de1eddd204b3
 2013-07-19 14:09:30 -07:00
Wink Saville
48f0c5a396 am d7aeae15: am df43ba82: am e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev 
* commit 'd7aeae15a1ae9e1fc23d14d107825a1ffef41e2c':
  When a SIM is changed check mobile provisioning.
 2013-07-19 13:42:36 -07:00
Robert Greenwalt
64031ab2a3 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
248d8d2c69 am b5bf655c: am 1f905ded: 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
d7aeae15a1 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
feb4923c50 Merge "checkMobileProvisioning is not using sendNotification." 2013-07-19 17:14:41 +00:00
Wink Saville
b56c4fd054 checkMobileProvisioning is not using sendNotification. 
Change-Id: Ie5b98b462b29fe9339fcb8207d2d33e3028a155c
 2013-07-19 09:27:56 -07:00
Christopher Tate
53d68e16d8 Fix build & preserve DHCP scheduling as-is 
Change-Id: I4063b18532c476280f343658bf3641495e526ed4
 2013-07-18 18:23:57 -07:00
Robert Greenwalt
81b0274875 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
cbf3ebe8d6 Add gservices updater for carrier provisioning url 
bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
 2013-07-18 11:24:56 -07:00
The Android Automerger
fd23238ed3 merge in klp-release history after reset to master 2013-07-18 06:01:57 -07:00
Robert Greenwalt
1f905dede5 Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev 2013-07-17 23:46:25 +00:00
Wink Saville
c6b52728f1 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
7ddc6c985d Add gservices updater for carrier provisioning url 
bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
 2013-07-17 14:05:33 -07:00
Wink Saville
9564f2b34f 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
b24810e7f7 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
8e4bc07d95 merge in klp-release history after reset to master 2013-07-16 06:01:24 -07:00
Geremy Condra
cd7b82033d Merge "Support routing sockets as another user" 2013-07-15 21:57:18 +00:00
Geremy Condra
c4f78f6100 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
31de0b69b0 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
6fc25cfd15 am 9bd03ece: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit '9bd03ece3c5a5da0f101c7551666bd6752202611':
 2013-07-15 09:37:54 -07:00
The Android Open Source Project
9bd03ece3c Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: Ib08f5c3c72f9d6eee571e7f9dff130abadffbbec
 2013-07-15 09:32:49 -07:00
The Android Automerger
3ad46b8636 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-15 08:19:11 -07:00
The Android Automerger
16998180e9 merge in klp-release history after reset to master 2013-07-15 06:01:32 -07:00
Chad Brubaker
ccae0d365b 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
fa15058755 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
c137d87017 am 7d8ad734: am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev 
* commit '7d8ad734af2dee4e7d6f9c5eee8487e020b374ea':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
 2013-07-12 12:14:01 -07:00
Wink Saville
7d8ad734af 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
dfabd993a7 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
e906fadb8a merge in klp-release history after reset to master 2013-07-09 06:00:45 -07:00
The Android Open Source Project
5c0dd380d0 am 29dd8449: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit '29dd8449e6d3ee34e229e8efdb1024c20e2cddd2':
 2013-07-08 15:52:24 -07:00
The Android Open Source Project
29dd8449e6 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: Id0d9eb3205906b409e735546b988f43a3bdcc0ae
 2013-07-08 15:33:43 -07:00
The Android Automerger
40a15ad43c merge in klp-release history after reset to master 2013-07-08 06:00:54 -07:00
The Android Automerger
ccf8df7dec 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
013df9a0a7 am d25b6b73: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
* commit 'd25b6b7372984cc0986868af9c53a4979436b6a8':
  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
d25b6b7372 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
a3ef83cc3c am ef5c31ae: am db011499: am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev 
* commit 'ef5c31ae3eced8b5def6881c86d962fa07d43fb0':
  Fix  NPE if mobile is not supported in checkMobileProvisioning.
 2013-07-02 15:56:45 -07:00
Wink Saville
b72702da1f am ef5c31ae: am db011499: am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev 
* commit 'ef5c31ae3eced8b5def6881c86d962fa07d43fb0':
  Fix  NPE if mobile is not supported in checkMobileProvisioning.
 2013-07-02 12:41:31 -07:00
Wink Saville
ef5c31ae3e am db011499: am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev 
* commit 'db011499c80f663b30564f1978f3e8e56d60f6c6':
  Fix  NPE if mobile is not supported in checkMobileProvisioning.
 2013-07-02 12:36:47 -07:00
Wink Saville
ec5eb01134 Fix NPE if mobile is not supported in checkMobileProvisioning. 
Bug: 9664438
Change-Id: If0c4938956a80e8d6a21a968aa771d0d8f546b3c
 2013-07-02 11:57:47 -07:00
Wink Saville
fdb84863b3 Fix NPE if mobile is not supported in checkMobileProvisioning. 
Bug: 9664438
Change-Id: If0c4938956a80e8d6a21a968aa771d0d8f546b3c
 2013-07-02 10:55:14 -07:00
The Android Automerger
be29d7f9ae merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-02 05:55:24 -07:00
Wink Saville
2e63bb7ef5 Merge commit '68513498' into fix-merge-conflict 
* commit '68513498':
  Add checkMobileProvisioning to ConnectivityService.

Conflicts:
	services/java/com/android/server/ConnectivityService.java

Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458
 2013-07-01 16:12:31 -07:00
Wink Saville
68513498e7 am c45f2e05: am 59046f40: Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-dev 
* commit 'c45f2e05e3b9d261009c66346ef2257ec105f05c':
  Add checkMobileProvisioning to ConnectivityService.
 2013-07-01 15:41:31 -07:00
Wink Saville
690cb18254 Add checkMobileProvisioning to ConnectivityService. 
Bug: 9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
 2013-06-29 21:10:57 -07:00