Commit Graph

1091 Commits

Author SHA1 Message Date
Robert Greenwalt
252b3e6f51 am 680a35ba: am ec4d5da6: am 1b7f99b9: Merge "Retry captiveportal check even if only one addr" into klp-dev
* commit '680a35ba19baf579c2d2da34442fac8b18002cd4':
  Retry captiveportal check even if only one addr
2013-10-15 17:41:03 -07:00
Robert Greenwalt
680a35ba19 am ec4d5da6: am 1b7f99b9: Merge "Retry captiveportal check even if only one addr" into klp-dev
* commit 'ec4d5da6f99b70768ace085782cf5b24f8697025':
  Retry captiveportal check even if only one addr
2013-10-15 17:37:05 -07:00
Robert Greenwalt
6bfeaeb49b Retry captiveportal check even if only one addr
We're getting some false positive results on this check and
while it was coded to try 3 times given sufficient independent addrs
the default url resolves to a single address so we'd just try once.

Rework to try again even with fewer urls to try to reduce the false
positives.

Also adds a random query param to fool proxies into not caching.

bug:9972012
Change-Id: Ib719f40ec612065ca6bcd919549fc1164506d35a
2013-10-15 12:43:30 -07:00
Narayan Kamath
32dd3cc091 Fix minor thread corectness issue in NetworkInfo
Hold the right lock while copying info from another
NetworkInfo object to prevent changes being made to it
while the copy is in progress.

Change-Id: I1aa2c29e81e045b0359f957352c438e79e692823
2013-10-14 09:07:40 +00:00
Jason Monk
4c6caa5172 am 6b57033b: am 8b81a638: Merge "getProxy in ConnectivityService returns port w/PAC" into klp-dev
* commit '6b57033b022890242d6833b494040c360af691d0':
  getProxy in ConnectivityService returns port w/PAC
2013-10-10 16:05:48 -07:00
Jason Monk
445cea8371 getProxy in ConnectivityService returns port w/PAC
Changes the PacManager to report message back to ConnectivityService
to send a broadcast once the download has completed.  This allows the
ConnectivityService to store the correct proxy info for getProxy().

This made the problem arise that ProxyProperties was not handling port
while it had PAC.  Added small fix for equals() and parcelization.

The combination of these fixes seems to resolve Bug: 11028616.

Bug: 11168706
Change-Id: I92d1343a8e804391ab77596b8167a2ef8d76b378
2013-10-10 17:01:45 -04:00
Lorenzo Colitti
cf9596ddee am 18225508: am 49052093: Merge "Fix captive portal detection on IPv6 networks." into klp-dev
* commit '18225508dd8c9d833c1699ad17a6bba4e4a46c4f':
  Fix captive portal detection on IPv6 networks.
2013-10-08 19:18:51 -07:00
Lorenzo Colitti
490520930e Merge "Fix captive portal detection on IPv6 networks." into klp-dev 2013-10-09 02:14:43 +00:00
Ed Heyl
3ac333722e am 4951ebb9: am f372ba45: merge in KQS81M
* commit '4951ebb9659c8118051d873310754bb161614503': (78 commits)
  wappush: Use valid index for pdu including garbages
  ImageReader: fix the 0 crop rect size issue
  Hide Experimental WebView from dev settings DO NOT MERGE
  Clear names from externally supplied WorkSources to WifiManager (b/10733757)
  Only show launcher for the bottom activity in a task
  Fix issue #10310128: CTS: android.security.cts.ServicePermissionsTest
  Ensures that CompatibilityInfo is always set in Resources
  Put soundpooled sounds in the right place.
  Fix a regression in pausing activity immediately on sleep
  TextureView/GLES20Canvas: Support synchronous GLConsumers
  Debug for b/10689184.
  Increasing visibility of pressed feedback for default ui widget assets
  Use a separate thread for services that do NTP lookup
  Also catch one more tablet layout NPE.
  Fix tablet layout and resources.
  New sounds for K.
  Do not assign InputMethod to non-input windows.
  Fix parenthetical error.
  Fix media stress test.
  Update the Connectivity Manager test suit to use InstrumentationTestCase.
  ...
2013-10-08 15:54:03 -07:00
Ed Heyl
f372ba4500 merge in KQS81M 2013-10-08 15:40:08 -07:00
Lorenzo Colitti
e25513dccc Fix captive portal detection on IPv6 networks.
Currently the captive portal check URL is generated by
concatenating scheme, "://", IP address, and port. This breaks
for IPv6 because IPv6 addresses in URLs must be enclosed in
square brackets (e.g., http://2001:db8::1/generate_204 is
invalid; should he http://[2001:db8::1]/generate_204 instead).
The resulting MalformedURLException causes isMobileOk to report
that there is no captive portal, even if there is one.

Fortunately the three-arg URL constructor already knows how to
construct URLs with IPv6 addresses. Use that instead of
generating the URL ourselves.

Bug: 10801896
Change-Id: I02605ef62f493a34f25bb405ef02b111543a76fd
2013-10-08 14:15:14 +09:00
Robert Greenwalt
50a520b2e8 am 81d1af26: am 7922764b: am 81371b98: (-s ours) am 64e02e64: am 5a1519f8: DO NOT MERGE Un-deprecate getDhcpInfo
* commit '81d1af2605f43a8f6722371a8d3f2d0f81a8d5f2':
  DO NOT MERGE Un-deprecate getDhcpInfo
2013-10-06 18:19:12 -07:00
Robert Greenwalt
5d772b6f98 am 8070ffcc: am 319323d7: am 8fbc8797: (-s ours) am 202965ca: am 5b41b261: (-s ours) DO NOT MERGE Un-deprecate getDhcpInfo
* commit '8070ffccbbb55721edd4ac014d6a675439a9926e':
  DO NOT MERGE Un-deprecate getDhcpInfo
2013-10-06 18:19:09 -07:00
Robert Greenwalt
7922764bb5 am 81371b98: (-s ours) am 64e02e64: am 5a1519f8: DO NOT MERGE Un-deprecate getDhcpInfo
* commit '81371b981e192f1848d355338c376a6bcd4ff532':
  DO NOT MERGE Un-deprecate getDhcpInfo
2013-10-06 17:11:00 -07:00
Robert Greenwalt
319323d7b0 am 8fbc8797: (-s ours) am 202965ca: am 5b41b261: (-s ours) DO NOT MERGE Un-deprecate getDhcpInfo
* commit '8fbc879773a7163fc2f97d6a6612dfb3167ad7f0':
  DO NOT MERGE Un-deprecate getDhcpInfo
2013-10-06 17:10:57 -07:00
Robert Greenwalt
81371b981e am 64e02e64: am 5a1519f8: DO NOT MERGE Un-deprecate getDhcpInfo
* commit '64e02e64341d33edda1d0ec28d5394c8d0d6509e':
  DO NOT MERGE Un-deprecate getDhcpInfo
2013-10-06 17:03:59 -07:00
Robert Greenwalt
8fbc879773 am 202965ca: am 5b41b261: (-s ours) DO NOT MERGE Un-deprecate getDhcpInfo
* commit '202965ca2a6cd02840581813f2b60660c71baf60':
  DO NOT MERGE Un-deprecate getDhcpInfo
2013-10-06 17:03:56 -07:00
Robert Greenwalt
64e02e6434 am 5a1519f8: DO NOT MERGE Un-deprecate getDhcpInfo
* commit '5a1519f8d1ff7e9623a347ca138ca925e07844cd':
  DO NOT MERGE Un-deprecate getDhcpInfo
2013-10-04 14:17:18 -07:00
Robert Greenwalt
202965ca2a am 5b41b261: (-s ours) DO NOT MERGE Un-deprecate getDhcpInfo
* commit '5b41b261dbef993bab7a68f61088274a977f345e':
  DO NOT MERGE Un-deprecate getDhcpInfo
2013-10-04 14:15:52 -07:00
Robert Greenwalt
51ff2b0d9e am 2e23484e: am 990c224f: Merge "Un-deprecate getDhcpInfo" into klp-dev
* commit '2e23484eec2321537e843168f76cba4c18b56f95':
  Un-deprecate getDhcpInfo
2013-10-04 13:34:08 -07:00
Robert Greenwalt
978c8728f5 am 32c9cd84: am 939def7d: Merge "Don\'t redirect dns to an iface without dns servers" into klp-dev
* commit '32c9cd84034512f54fe05c66fd73279c8f1ca596':
  Don't redirect dns to an iface without dns servers
2013-10-04 13:34:05 -07:00
Robert Greenwalt
5b41b261db DO NOT MERGE Un-deprecate getDhcpInfo
Replacement api isn't available.

bug:10003785
Change-Id: I0c91716d9aae61dc1db4d015a78b729157ea99a9
2013-10-04 18:43:29 +00:00
Robert Greenwalt
990c224ffa Merge "Un-deprecate getDhcpInfo" into klp-dev 2013-10-04 18:07:34 +00:00
Robert Greenwalt
939def7d91 Merge "Don't redirect dns to an iface without dns servers" into klp-dev 2013-10-04 18:06:13 +00:00
Robert Greenwalt
50df961cca Un-deprecate getDhcpInfo
Replacement api isn't available.

bug:10003785
Change-Id: Ibe981ae90e1c6c2f1b65fa225443ae4cc92c2a3a
2013-10-04 09:53:39 -07:00
Robert Greenwalt
5a1519f8d1 DO NOT MERGE Un-deprecate getDhcpInfo
Replacement api isn't available.

bug:10003785
Change-Id: I0c91716d9aae61dc1db4d015a78b729157ea99a9
2013-10-04 08:19:37 -07:00
Wink Saville
6ed7bfda87 am fe587dba: am a48ccdd6: Merge "Use networkType to display wifi and mobile notification separately." into klp-dev
* commit 'fe587dba3a70c658140eac1b13996b7d8e6eeda2':
  Use networkType to display  wifi and mobile notification separately.
2013-10-03 21:30:29 -07:00
Wink Saville
a65f473111 Use networkType to display wifi and mobile notification separately.
There are two bugs one is I was clearing the notification in
CaptivePortalTracker when entering the ActivateState. (double check
according to bug 5021626 we should be calling enter)

Second is we could have the need to display both icons but can't
because we only allow one.

The solution I'm proposing here is to allow two notifications and
have then controlled separately.

Bug: 10886908
Change-Id: I30e7130bc542535492d175640a4990c592f32806
2013-10-03 08:34:46 -07:00
Robert Greenwalt
68534c89f7 Don't redirect dns to an iface without dns servers
bug:10115444
Change-Id: Ide42072bb3aae21f8e99c11c2de263e9a765b911
2013-09-25 16:58:45 -07:00
The Android Automerger
9d6d1a1ace merge in klp-release history after reset to klp-dev 2013-09-16 06:01:18 -07:00
Wink Saville
f5c393eb7e Tighten condition for calling checkMobileProvisioning.
Add the condition that the connected network needs to be TYPE_MOBILE.
This eliminates checking on connecting to secondary networks like
FOTA, MMS, SUPL ...

This reduces unnecessary attempts to bring up multiple connections at
the same time. Especially in the light of the trouble we're having with HFA
on Sprint, where we don't want to connect to any other network until HFA
has completed.

Bug: 10758001
Change-Id: Id294536b70304a51de4752bc1a4ffac734f10f1a
2013-09-14 14:01:03 -07:00
Wink Saville
3418e65e81 am 78d0cf79: Merge "Tighten condition for calling checkMobileProvisioning." into klp-dev
* commit '78d0cf7958dfde7951ed1a2c0317e04d6b41f4f3':
  Tighten condition for calling checkMobileProvisioning.
2013-09-14 11:21:07 -07:00
Wink Saville
ab773a7b89 Tighten condition for calling checkMobileProvisioning.
Add the condition that the connected network needs to be TYPE_MOBILE.
This eliminates checking on connecting to secondary networks like
FOTA, MMS, SUPL ...

This reduces unnecessary attempts to bring up multiple connections at
the same time. Especially in the light of the trouble we're having with HFA
on Sprint, where we don't want to connect to any other network until HFA
has completed.

Bug: 10758001
Change-Id: Id294536b70304a51de4752bc1a4ffac734f10f1a
2013-09-14 09:04:53 -07:00
Wink Saville
6d64e98cff checkMobileProvisioning should not block.
In checkMobileProvisioning the call to mdst.isProvisioningNetwork() is
a blocking call and during monkey testing without SIM this is causing
ANR's. Move the initial test for provisioning into isMobileOk so
checkMobileProvisioning doesn't block.

If mobile is not supported return CMP_RESULT_NO_CONNECTION.

Cleaned up some debug.

Bug: 10674404
Change-Id: I10a0e922cd6ea9790f66e2083f37e68cb0a8861f
2013-09-13 19:13:21 -07:00
Wink Saville
d0fe9386b2 am 6bcb8cd7: Merge "checkMobileProvisioning should not block." into klp-dev
* commit '6bcb8cd74a4645e3ea08bd1bd39c454e18cdc619':
  checkMobileProvisioning should not block.
2013-09-13 17:14:15 -07:00
Jason Monk
41abc43aff am c10eef7e: Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev
* commit 'c10eef7e3b54822c8be1c19a9dd1703dfd6f34a6':
  Guarantee that PAC Local Proxy owns Port
2013-09-13 17:14:10 -07:00
Wink Saville
6bcb8cd74a Merge "checkMobileProvisioning should not block." into klp-dev 2013-09-13 20:59:16 +00:00
Jason Monk
c10eef7e3b Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev 2013-09-13 20:31:54 +00:00
Wink Saville
3985671349 checkMobileProvisioning should not block.
In checkMobileProvisioning the call to mdst.isProvisioningNetwork() is
a blocking call and during monkey testing without SIM this is causing
ANR's. Move the initial test for provisioning into isMobileOk so
checkMobileProvisioning doesn't block.

If mobile is not supported return CMP_RESULT_NO_CONNECTION.

Cleaned up some debug.

Bug: 10674404
Change-Id: I10a0e922cd6ea9790f66e2083f37e68cb0a8861f
2013-09-13 12:40:11 -07:00
Jason Monk
af9ded0007 Guarantee that PAC Local Proxy owns Port
This changes the PAC support to not broadcast the Proxy information until
the Local Proxy has started up and successfully bound to a port so that
the local proxy information can be guaranteed to be owned by the proxy.

Bug: 10459877
Change-Id: I175cd3388c758c55e341115e4a8241884b90d633
2013-09-13 09:53:26 -04:00
The Android Automerger
267aebc2c9 merge in klp-release history after reset to klp-dev 2013-09-12 06:01:29 -07:00
Yuhao Zheng
d603b89567 Fix for the toggle airplane mode hidden API
Fix to https://googleplex-android-review.git.corp.google.com/#/c/356900/
Previous implementation throws SecurityException when the API is called from apps.
bug:10653570

Change-Id: I95ae6f07db74d881f1a8d3d40a6486105a068e90
2013-09-11 14:39:19 -07:00
Jeff Sharkey
8d08a9bdc7 am 4a13f358: Merge changes Ib1274847,I2eb2a1bf into klp-dev
* commit '4a13f358841505e8e3747c3ff983dc8777504add':
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
2013-09-11 13:19:12 -07:00
Jeff Sharkey
4a13f35884 Merge changes Ib1274847,I2eb2a1bf into klp-dev
* changes:
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
2013-09-11 20:16:59 +00:00
Yuhao Zheng
3a2617c02d am 518c0afa: Merge "Fix for the toggle airplane mode hidden API" into klp-dev
* commit '518c0afaea02f9a680f6912bde2d73b0357236ca':
  Fix for the toggle airplane mode hidden API
2013-09-11 10:38:36 -07:00
Yuhao Zheng
8257936014 Fix for the toggle airplane mode hidden API
Fix to https://googleplex-android-review.git.corp.google.com/#/c/356900/
Previous implementation throws SecurityException when the API is called from apps.
bug:10653570

Change-Id: I95ae6f07db74d881f1a8d3d40a6486105a068e90
2013-09-11 09:44:28 -07:00
Jeff Sharkey
86dc7a89da Request all tethering interfaces, fix corruption.
netd now tracks statistics for tethered interfaces across tethering
sessions, so switch to asking for all tethering stats.  (Currently
we're double-counting all tethering data, ever since it started
tracking across sessions.)

Also catch OOME to handle corrupt stats files, which we then dump to
DropBox and then start over.

Bug: 5868832, 9796109
Change-Id: I2eb2a1bf01b993dd198597d770fe0e022466c6b9
2013-09-10 21:03:30 -07:00
The Android Automerger
e128209203 merge in klp-release history after reset to klp-dev 2013-09-10 14:28:38 -07:00
Yuhao Zheng
aa3d64c616 am e91a3f52: Merge "Add a hidden API to toggle airplane mode." into klp-dev
* commit 'e91a3f5229405b39a3ba59aa0a3e44527eef063e':
  Add a hidden API to toggle airplane mode.
2013-09-10 10:13:22 -07:00
Yuhao Zheng
1501989df0 Add a hidden API to toggle airplane mode.
Added a hidden API under ConnectivityManager to toggle airplane mode.
This may be a temp solution for b/10653570.
bug:10653570

Change-Id: I0b2b42230073289eb8dc6891317d62b84e26c133
2013-09-10 09:57:12 -07:00