LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,102 Commits 2 Branches 0 Tags
6e35df34c98a5ecb0c17ec8dd1a2bb1b465144cc
Commit Graph

1102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Wink Saville
6152916c45 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
3ef153324c Fix NPE if mobile is not supported in checkMobileProvisioning. 
Bug: 9664438
Change-Id: If0c4938956a80e8d6a21a968aa771d0d8f546b3c
 2013-07-02 11:57:47 -07:00
Wink Saville
d469c47d5b 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
e5e505f2df merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-02 05:55:24 -07:00
Wink Saville
0cc0a44c2f Merge commit '3463b3ff' into fix-merge-conflict 
* commit '3463b3ff':
  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
3463b3ff48 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
32506bca6f Add checkMobileProvisioning to ConnectivityService. 
Bug: 9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
 2013-06-29 21:10:57 -07:00
Lorenzo Colitti
d78d557cb8 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
1f5cec7fdc 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
a891d7bd00 Explicit locale when formatting machine strings. 
Bug: 9390451
Change-Id: I3581c53407554a1dffd541fb42b06d68f20a7be0
 2013-06-11 14:36:41 -07:00
Jeff Sharkey
79f3e029d4 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
61f11e1fd1 Merge "Fix parsing of global:http_proxy value." 2013-05-28 23:06:30 +00:00
Andreas Huber
23bff230fc 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
5f15365229 Reconcile with jb-mr2-release - do not merge 
Change-Id: I6e813db1760b5f2889fac72f042d82743179cc66
 2013-05-28 07:37:29 -07:00
The Android Automerger
af274e807d 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
2b36dff573 Reconcile with jb-mr2-release - do not merge 
Change-Id: I0f933138aaf9f70694ef9a326c3db63770a93917
 2013-05-24 15:28:19 -07:00
Robert Greenwalt
189a9e0ae9 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
0c3afc1159 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
4398f34e47 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
b69e58df12 Reconcile with jb-mr2-release - do not merge 
Change-Id: Id3816eec8bf8ceef1883fab3f81803177588eed1
 2013-05-16 05:43:31 -07:00
The Android Automerger
a685e7e1af merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-25 05:55:26 -07:00
Wink Saville
685b2afeba am 36fe96be: Merge "Support WiFi only device at runtime." into jb-mr2-dev 
* commit '36fe96be7ccf388f27bb98859f89aff13cdc6e11':
  Support WiFi only device at runtime.
 2013-04-24 08:47:45 -07:00
Wink Saville
36fe96be7c Merge "Support WiFi only device at runtime." into jb-mr2-dev 2013-04-24 15:44:08 +00:00
Wink Saville
00fe5095f5 Support WiFi only device at runtime. 
To date WiFi only devices were defined by the list of networkAttributes
in config.xml overriden in on a per-device basis. This change is the
simplest change needed to determine this at runtime and therefore allowing
a single build to support the two different configurations.

Bug: 8562845
Change-Id: I34de5c6accc718b199c13815537de1debfe3dc91
 2013-04-23 14:26:51 -07:00
The Android Automerger
4ad1ae1884 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-23 05:55:28 -07:00
Robert Greenwalt
df458aa25f am fe2c421f: Merge "Listen for network disconnect." into jb-mr2-dev 
* commit 'fe2c421fa9051dd0608e9340c5ec641e5f83f651':
  Listen for network disconnect.
 2013-04-23 03:51:08 -07:00
Robert Greenwalt
fe2c421fa9 Merge "Listen for network disconnect." into jb-mr2-dev 2013-04-22 21:33:29 +00:00
Robert Greenwalt
9a37e5d28d Listen for network disconnect. 
VPN used to just watch the interface, but that is insufficient.  There
is no promise that the interface will go down when we're done with it.
Now that wifi stays on in scan-only mode despite user turning it off
it seems that the interface is left up, even in AP mode.

Now listening for ConnectivityService broadcast that the network we were on
has disconnected and tearing down the VPN then or when the interface
goes away.

bug:8550083
Change-Id: Icf414497bc55bead69de04e91f39f90ac2e6578a
 2013-04-22 14:13:51 -07:00
The Android Automerger
85cdf803eb merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-22 05:55:37 -07:00
Robert Greenwalt
7360b699ba am 75267c4e: Remove STOPSHIP and defer removal. 
* commit '75267c4ee9c5480de5c9538f02c61ad4d9cd5ef0':
  Remove STOPSHIP and defer removal.
 2013-04-19 10:17:41 -07:00
Robert Greenwalt
75267c4ee9 Remove STOPSHIP and defer removal. 
bug:8657300
Change-Id: Ia855fdc0db7a33502838648ee002d4929b224960
 2013-04-19 09:31:24 -07:00
The Android Open Source Project
8ecc0ad8fa Reconcile with jb-mr2-release - do not merge 
Change-Id: I618d51505419200bc282404ec2af470be97f1fa7
 2013-04-15 10:46:07 -07:00
The Android Automerger
3299aa6182 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-15 05:55:51 -07:00
Robert Greenwalt
e6f90c6add am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev 
* commit '3016244ffb0ee59a191b294839468a81b45a01f1':
  Add new route.hasGateway() api
 2013-04-12 12:07:14 -07:00