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

914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
1f905dede5 Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev 2013-07-17 23:46:25 +00: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
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
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 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
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
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
Lorenzo Colitti
25f5af234f 464xlat: use a gatewayed route, not point-to-point 
Various applications such as Skype and our legacy VPN code
do not understand routes pointed directly at point-to-point
interfaces and require a default gateway IPv4 address in
order to function.

Grudgingly accept that routes without default gateways Are Hard
and use gatewayed routes instead. This causes routing to go from:

default dev clat4  scope link

to:

default via 192.0.0.4 dev clat4  scope link
192.0.0.4 dev clat4  scope link

and those apps now work.

Bug: 9597256
Bug: 9597516
Change-Id: I7b7890873802d3cb99affd6eb70b8ab75e7a2cf6
 2013-06-29 00:14:43 +09:00
John Spurlock
4ba7e413e7 Move battery stats call from SystemUI to system server. 
The UPDATE_DEVICE_STATS permission is no longer required in sysui.

Change-Id: Icc3120b7873563e3727e56bed9f3b4767da0606d
 2013-06-25 10:21:11 -04:00
Jeff Sharkey
cf6e4d80e8 Explicit locale when formatting machine strings. 
Bug: 9390451
Change-Id: I3581c53407554a1dffd541fb42b06d68f20a7be0
 2013-06-11 14:36:41 -07:00
Jeff Sharkey
e9bda1dd68 Accumulate network statistics based on deltas. 
Network stats are now read out of the kernel in one sweep, instead of
reading per-UID.  We now accumulate the delta traffic between each
stats snapshot using the well-tested SamplingCounter pattern.

Since Wi-Fi and mobile traffic have different costs, track each
separately.  Avoids counting misc interfaces like loopback and
ethernet under total.

Bug: 5543387
Change-Id: I642004dc530113c27ef79f2abbae51d8af30117f
 2013-06-06 14:35:34 -07:00
Andreas Huber
36b169250b Merge "Fix parsing of global:http_proxy value." 2013-05-28 23:06:30 +00:00
Andreas Huber
9df8955fe1 Fix parsing of global:http_proxy value. 
This caused a runtime restart for ':' and did not disable the proxy for ""
before.

Change-Id: Ib88b21e9eba5818a4968ae604abad8a3b3d1766f
 2013-05-28 15:17:37 -07:00
The Android Open Source Project
fb878f87a7 Reconcile with jb-mr2-release - do not merge 
Change-Id: I6e813db1760b5f2889fac72f042d82743179cc66
 2013-05-28 07:37:29 -07:00
The Android Automerger
cea3bd39c3 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-26 05:55:27 -07:00
The Android Open Source Project
4edec272e4 Reconcile with jb-mr2-release - do not merge 
Change-Id: I0f933138aaf9f70694ef9a326c3db63770a93917
 2013-05-24 15:28:19 -07:00
Robert Greenwalt
6a2f4639c6 Use the old interface when resetting connections 
The new one is often null when disconnected, so using the new fails.
In other situations, it's the connections on the old network we want
to reset anyway, so the old code when it would work would also do
the wrong thing (unless new iface == old iface).

bug:9112928
Change-Id: I1fcae89cc3aa9d712e516e7c97cece0b89869bd9
 2013-05-24 12:25:04 -07:00
Robert Greenwalt
3a004ee4a0 am 36a151ab: Merge "Use the old interface when resetting connections" into jb-mr2-dev 
* commit '36a151abcd794524358a74599a1f4ab130ca7b55':
  Use the old interface when resetting connections
 2013-05-24 09:24:32 -07:00
Robert Greenwalt
ec8a9e6200 Use the old interface when resetting connections 
The new one is often null when disconnected, so using the new fails.
In other situations, it's the connections on the old network we want
to reset anyway, so the old code when it would work would also do
the wrong thing (unless new iface == old iface).

bug:9112928
Change-Id: I1fcae89cc3aa9d712e516e7c97cece0b89869bd9
 2013-05-23 18:33:06 -07:00
The Android Open Source Project
b2aa01c0dc Reconcile with jb-mr2-release - do not merge 
Change-Id: Id3816eec8bf8ceef1883fab3f81803177588eed1
 2013-05-16 05:43:31 -07:00
The Android Automerger
4104544a95 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-25 05:55:26 -07:00
Wink Saville
7d72bf5622 am d292caf4: Merge "Support WiFi only device at runtime." into jb-mr2-dev 
* commit 'd292caf445208d79e135963bbbfce3fef18830aa':
  Support WiFi only device at runtime.
 2013-04-24 08:47:45 -07:00