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
Robert Greenwaltcommited 2013-10-15 12:43:30 -07:00
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
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
* 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.
...
Ed Heylauthored and Android Git Automergercommited 2013-10-08 15:54:03 -07:00
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
Lorenzo Colitticommited 2013-10-08 14:15:14 +09:00
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
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
Wink Savilleauthored and The Android Automergercommited 2013-09-14 14:01:03 -07:00
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
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
Wink Savilleauthored and The Android Automergercommited 2013-09-13 19:13:21 -07:00
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
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
Robert Greenwalt
authored and
Android Git Automerger
commited 
Narayan Kamath
commited 
The Android Automerger
commited 
Jason Monk
authored and
Dianne Hackborn
authored and
The Android Automerger
commited 
Lorenzo Colitti
authored and
Android (Google) Code Review
commited 
Ed Heyl
authored and
Wink Saville
authored and
Yuhao Zheng
authored and
Jeff Sharkey
authored and