Commit Graph

905 Commits

Author SHA1 Message Date
Wink Saville
a0ffa2ed4c am 55adb390: am 6db564f6: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
* commit '55adb390bb96175db9abee3ead349a98b4dc4262':
  Have CaptivePortalTracker use gservices updateable provisioning urls.
2013-08-08 15:46:52 -07:00
Wink Saville
80cc1ebde9 am 9b6363e5: am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev
* commit '9b6363e5e6d37e3e8d103751d81613eeca32bbbf':
  Check that hipri has started.
2013-08-08 15:46:46 -07:00
Wink Saville
6db564f6a3 Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev 2013-08-08 22:06:21 +00:00
Wink Saville
4a165bb3de Check that hipri has started.
I needed to test the result of startUsingNetworkFeature, otherwise
on mobile networks that are slow to come up, we won't detect
warm SIMs after booting.

Bug: 9962943
Change-Id: Ib638a4e43867ecaa85d6abff65643b77a63526b6
2013-08-07 11:02:57 -07:00
Wink Saville
f714b7f5a2 Have CaptivePortalTracker use gservices updateable provisioning urls.
After detecting there is a captive portal the url used in the
notification for mobile networks should be updateable via gservices.
These urls will be the same as used by CheckMp and is needed for
carriers that have specific provisioning urls such as AT&T and Verizon.

Bug: 9622647
Change-Id: Idcf4dabc72ece1dbbe1d5e5a21e550dd06fe16c7
2013-08-05 14:15:54 -07:00
Elliott Hughes
6b67e07d21 am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."
* commit '60ae2617b4b304fc3e45a441f87d1765714477ba':
  If frameworks wants ASCII casing, it should explicity ask for it.
2013-08-02 17:41:57 -07:00
Elliott Hughes
5547882084 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
178acfced7 am 15884007: Merge "464xlat: use a gatewayed route, not point-to-point"
* commit '158840079a501784c76e9816b215b3a1839074ef':
  464xlat: use a gatewayed route, not point-to-point
2013-07-30 09:57:18 -07:00
Lorenzo Colitti
00f6629ed9 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
7d0a85e213 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I1d7f0e0f6a4cb8b9363c99a830dc1656424ad49d
2013-07-19 14:20:43 -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
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
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
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
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
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
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
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
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
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
Wink Saville
d292caf445 Merge "Support WiFi only device at runtime." into jb-mr2-dev 2013-04-24 15:44:08 +00:00
Wink Saville
23ee8db792 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
e918ff4ed9 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-23 05:55:28 -07:00
Robert Greenwalt
7a8f0658c6 am 665c912a: Merge "Listen for network disconnect." into jb-mr2-dev
* commit '665c912a4c2c977c6d2e1ea3bbf6bcdf877d6e34':
  Listen for network disconnect.
2013-04-23 03:51:08 -07:00
Robert Greenwalt
665c912a4c Merge "Listen for network disconnect." into jb-mr2-dev 2013-04-22 21:33:29 +00:00
Robert Greenwalt
308b9acca1 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
ee21d8b57b merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-22 05:55:37 -07:00
Robert Greenwalt
f95bfb1fa5 am a07f1f2d: Remove STOPSHIP and defer removal.
* commit 'a07f1f2d07832eaebe011f018cfbc643cf4a0dbd':
  Remove STOPSHIP and defer removal.
2013-04-19 10:17:41 -07:00
Robert Greenwalt
a07f1f2d07 Remove STOPSHIP and defer removal.
bug:8657300
Change-Id: Ia855fdc0db7a33502838648ee002d4929b224960
2013-04-19 09:31:24 -07:00