Commit Graph

889 Commits

Author SHA1 Message Date
Ken Mixter
0c6544bd73 Fix NPE in ConnectivityService
Could occur when requestRouteToHostAddress is called on a network
with no associated tracker.  Code later in the method handles
this case gracefully but code introduced in JB throws an exception.

Change-Id: I6c8a0e313ecbcca120aeb5dd0802a72114749aa1
2013-11-12 22:17:46 -08:00
Elliott Hughes
4e3475964b If frameworks wants ASCII casing, it should explicity ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Iaab02e718a7be7bda22e626dca05d79bfd2a8fc4
2013-08-02 15:12:32 -07:00
Lorenzo Colitti
97049e5111 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-07-31 01:09:53 +09: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
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 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
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
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
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
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
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
Robert Greenwalt
59070cfd32 Add new route.hasGateway() api
Fixes issues brought in by change to isHostRoute.  isHostRoute
was technically correct, but the callers really wanted hasNextHop
behavior.

bug:8597268
Change-Id: I360761ccfa98b2ba34642f717a78fa71ec1bae4f
2013-04-12 11:22:52 -07:00
Robert Greenwalt
f14237c63a am cb2f7211: Merge "Routing workaround." into jb-mr2-dev
* commit 'cb2f721169778315fe30db44336cb40798b698f9':
  Routing workaround.
2013-04-11 16:29:38 -07:00
Robert Greenwalt
cb2f721169 Merge "Routing workaround." into jb-mr2-dev 2013-04-11 23:27:20 +00:00
Robert Greenwalt
f7008227fd am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev
* commit 'ccbe7e6ff16fe1afc08f0b8601d83481ba5aee3a':
  Use CONNECTIVITY_INTERNAL for global proxy
2013-04-11 14:16:28 -07:00
Robert Greenwalt
6477bd0519 Use CONNECTIVITY_INTERNAL for global proxy
The Global http proxy shouldn't be used by apps, but can be useful in certain
conditions.

bug:8264794
bug:8557674
Change-Id: Ia3cbe542e448d9e74d0492626a13e9fd34ad797a
2013-04-10 15:32:18 -07:00
The Android Open Source Project
9a80dd84c2 Reconcile with jb-mr2-release - do not merge
Change-Id: I3f174e8a8e79b7f7ab1ced7ba665c538183948f2
2013-04-10 10:05:34 -07:00
The Android Automerger
72527d6017 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-10 05:56:05 -07:00
Robert Greenwalt
6bd85ba473 Routing workaround.
Change our order of operations so that secondary route table
adds succeed.  Working to understand the why of this too.
bug:8361314

Change-Id: Ie25061eb38c62eaa5e60aa8a488496de49bdbd9d
2013-04-09 11:22:56 -07:00
Robert Greenwalt
0588c1b9af am dbf500aa: Merge "Turn back on global proxy support." into jb-mr2-dev
* commit 'dbf500aaafd0889aa3ac9bf0fb2b2be4e0c3ebbf':
  Turn back on global proxy support.
2013-04-09 11:19:34 -07:00
Robert Greenwalt
f9661d357f Turn back on global proxy support.
This reverts 138626.

Bug:8557674
Change-Id: I7b117d313c424d75bdeeea507541a96342f256f0
2013-04-08 16:31:26 -07:00
The Android Open Source Project
418265445d Reconcile with jb-mr2-release - do not merge
Change-Id: If51129696a3a4c3495ef07f2e74f854a9409013d
2013-04-03 16:43:20 -07:00
The Android Automerger
67a0649c66 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-03 06:02:30 -07:00
Lorenzo Colitti
03e29cceac am 6c2e8fb4: Merge "Fix LinkProperties\'s equals() method." into jb-mr2-dev
* commit '6c2e8fb4d530c5fb1352e8667449591b39d89c5a':
  Fix LinkProperties's equals() method.
2013-04-02 22:32:34 -07:00