Commit Graph

1100 Commits

Author SHA1 Message Date
Ed Heyl
6af8d3805c am fbbf046e: am e704c3c9: am 41e6e50c: merge in klp-release (no-op)
* commit 'fbbf046e622b5f0e7147e4d3e7cf31314aa00029': (27 commits)
  Fix dock rect calculation when nav is translucent.
  Fix registerListener and flush bugs.
  Guard against NPE when using existing process.
  Add missing locking when updating the accessibility node info cache.
  Fix issue #11113111: `dumpsys activity service` is broken
  Revert "Use a build-specific wifi country code"
  Fix CookieSyncManager for WebViewClassic
  Retain IME assignment if no windows accept input.
  KLP/KitKat is now API 19.
  Decouple construction of WebView, CookieSyncManager, WebViewDatabase
  Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle...
  De-blue the add lock screen widget pressed state
  De-blue notification backgrounds
  Revert behavior to perform onResume.
  PackageManager#queryIntentServices breaks its contract.
  Choosing default paper size for the "Save to PDF" fake printer
  Adding hidden APIs for observing the print jobs state.
  Disallow range selection if the document has unknown page count.
  Missed signal in FusedPrintersLoader.
  Page range validation edge case handling.
  ...
2013-10-16 18:07:23 -07:00
Ed Heyl
fbbf046e62 am e704c3c9: am 41e6e50c: merge in klp-release (no-op)
* commit 'e704c3c9ee6a9ed2b7fbf34a0fcf70b0062d0dfb': (27 commits)
  Fix dock rect calculation when nav is translucent.
  Fix registerListener and flush bugs.
  Guard against NPE when using existing process.
  Add missing locking when updating the accessibility node info cache.
  Fix issue #11113111: `dumpsys activity service` is broken
  Revert "Use a build-specific wifi country code"
  Fix CookieSyncManager for WebViewClassic
  Retain IME assignment if no windows accept input.
  KLP/KitKat is now API 19.
  Decouple construction of WebView, CookieSyncManager, WebViewDatabase
  Fix issue #10921903: CTS: android.os.cts.ParcelTest#testReadBundle...
  De-blue the add lock screen widget pressed state
  De-blue notification backgrounds
  Revert behavior to perform onResume.
  PackageManager#queryIntentServices breaks its contract.
  Choosing default paper size for the "Save to PDF" fake printer
  Adding hidden APIs for observing the print jobs state.
  Disallow range selection if the document has unknown page count.
  Missed signal in FusedPrintersLoader.
  Page range validation edge case handling.
  ...
2013-10-16 18:01:53 -07:00
Narayan Kamath
ab03543323 Remove captive portal code that has no effect.
Note that this CL does not change any behaviour.

At the center of this change is
CaptivePortalTracker#detectCaptivePortal(), which does nothing
except call back into ConnectivityService. Removing it allows us to
simplify code in ConnectivityService. It also allows us to remove
ConnectivityService#captivePortalCheckComplete which was only ever
called in response to this method.

While this does not change any behaviour, it preserves existing
bad behaviour, i.e, that the CAPTIVE_PORTAL_CHECK NetworkInfo
state does not correspond to actual captive portal detection.
We transition into that state and immediately (and unconditionally)
out of it and into CONNECTED.

Change-Id: Ib3797f956d2db5e3cacaaa53e899d81aa8e958af
2013-10-16 08:10:55 +00:00
The Android Automerger
df23a9b6ea merge in klp-release history after reset to klp-dev 2013-10-15 21:14:08 -07:00
Robert Greenwalt
5fc45ec60d am 791ba9de: am ec4d5da6: am 1b7f99b9: Merge "Retry captiveportal check even if only one addr" into klp-dev
* commit '791ba9decdd72d6267a03d93b18104ca89722817':
  Retry captiveportal check even if only one addr
2013-10-15 17:41:03 -07:00
Robert Greenwalt
791ba9decd 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
af2f34adfd 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
b82bc07c9d 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
The Android Automerger
0ee9847649 merge in klp-release history after reset to klp-dev 2013-10-13 06:01:56 -07:00
Jason Monk
2ce22dd500 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
a69f1b06de 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
Dianne Hackborn
75d9bcddea Fix issue #11113111: dumpsys activity service is broken
Change-Id: Ie02d27b377c562085ef7eb5dea144ce2f382c11d
2013-10-09 14:34:04 -07:00
The Android Automerger
254232b727 merge in klp-release history after reset to klp-dev 2013-10-09 06:01:14 -07:00
Lorenzo Colitti
1bbd7530ed am 18225508: am cabdbf9f: 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
cabdbf9fec Merge "Fix captive portal detection on IPv6 networks." into klp-dev 2013-10-09 02:14:43 +00:00
Ed Heyl
ab7c170368 am 4951ebb9: am e83f7307: 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
e83f730778 merge in KQS81M 2013-10-08 15:40:08 -07:00
Lorenzo Colitti
9405beeea0 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
The Android Automerger
bc0a421e8e merge in klp-release history after reset to klp-dev 2013-10-07 06:00:38 -07:00
Robert Greenwalt
dd86a25f80 am 81d1af26: am b1b99f67: am 4f15276a: (-s ours) am ff23ab37: am 88a69fc2: DO NOT MERGE Un-deprecate getDhcpInfo
* commit '81d1af2605f43a8f6722371a8d3f2d0f81a8d5f2':
  DO NOT MERGE Un-deprecate getDhcpInfo
2013-10-06 18:19:12 -07:00
Robert Greenwalt
9c9721efa3 am 8070ffcc: am 94475b9f: am fea09d86: (-s ours) am 0f1ac468: am f725b93f: (-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
b1b99f6765 am 4f15276a: (-s ours) am ff23ab37: am 88a69fc2: DO NOT MERGE Un-deprecate getDhcpInfo
* commit '4f15276a26f8f11636888e6e10d2577472d4505e':
  DO NOT MERGE Un-deprecate getDhcpInfo
2013-10-06 17:11:00 -07:00
Robert Greenwalt
94475b9ffb am fea09d86: (-s ours) am 0f1ac468: am f725b93f: (-s ours) DO NOT MERGE Un-deprecate getDhcpInfo
* commit 'fea09d861190b9c115cbb2518e1d9c465eb2256e':
  DO NOT MERGE Un-deprecate getDhcpInfo
2013-10-06 17:10:57 -07:00
Robert Greenwalt
4f15276a26 am ff23ab37: am 88a69fc2: DO NOT MERGE Un-deprecate getDhcpInfo
* commit 'ff23ab37b9d2318477247e87d288faad9d15e002':
  DO NOT MERGE Un-deprecate getDhcpInfo
2013-10-06 17:03:59 -07:00
Robert Greenwalt
fea09d8611 am 0f1ac468: am f725b93f: (-s ours) DO NOT MERGE Un-deprecate getDhcpInfo
* commit '0f1ac4682b0719b2cc900ea41a86a1c55ff50a75':
  DO NOT MERGE Un-deprecate getDhcpInfo
2013-10-06 17:03:56 -07:00
The Android Automerger
31104283d3 merge in klp-release history after reset to klp-dev 2013-10-06 06:01:24 -07:00
Robert Greenwalt
ff23ab37b9 am 88a69fc2: DO NOT MERGE Un-deprecate getDhcpInfo
* commit '88a69fc2c0b1334cfd430c2947ff6534b85f3359':
  DO NOT MERGE Un-deprecate getDhcpInfo
2013-10-04 14:17:18 -07:00
Robert Greenwalt
0f1ac4682b am f725b93f: (-s ours) DO NOT MERGE Un-deprecate getDhcpInfo
* commit 'f725b93f4855f5a2bf4a9e7428d03ca91a2e7b22':
  DO NOT MERGE Un-deprecate getDhcpInfo
2013-10-04 14:15:52 -07:00
Robert Greenwalt
772193b76e am 2e23484e: am f9179505: Merge "Un-deprecate getDhcpInfo" into klp-dev
* commit '2e23484eec2321537e843168f76cba4c18b56f95':
  Un-deprecate getDhcpInfo
2013-10-04 13:34:08 -07:00
Robert Greenwalt
f859cf43a5 am 32c9cd84: am d5e94d86: 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
f725b93f48 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
f917950551 Merge "Un-deprecate getDhcpInfo" into klp-dev 2013-10-04 18:07:34 +00:00
Robert Greenwalt
d5e94d8699 Merge "Don't redirect dns to an iface without dns servers" into klp-dev 2013-10-04 18:06:13 +00:00
Robert Greenwalt
5b1ce8a835 Un-deprecate getDhcpInfo
Replacement api isn't available.

bug:10003785
Change-Id: Ibe981ae90e1c6c2f1b65fa225443ae4cc92c2a3a
2013-10-04 09:53:39 -07:00
Robert Greenwalt
88a69fc2c0 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
e7052a6f4e 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
76f49d3cee 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
b87ab96295 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
66196d3804 merge in klp-release history after reset to klp-dev 2013-09-16 06:01:18 -07:00
Wink Saville
06c96d07ad 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
78822831ca 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
11fa47227d 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
e6d205263f 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
8a86956e5c am e1b4220f: Merge "checkMobileProvisioning should not block." into klp-dev
* commit 'e1b4220f8e423bb5af12e6688099fd3a1bd1c6ce':
  checkMobileProvisioning should not block.
2013-09-13 17:14:15 -07:00
Jason Monk
35d825cc58 am fddacc60: Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev
* commit 'fddacc604524ac5371c675d8e3963b5a5c475c80':
  Guarantee that PAC Local Proxy owns Port
2013-09-13 17:14:10 -07:00
Wink Saville
e1b4220f8e Merge "checkMobileProvisioning should not block." into klp-dev 2013-09-13 20:59:16 +00:00
Jason Monk
fddacc6045 Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev 2013-09-13 20:31:54 +00:00
Wink Saville
e14346f8f4 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
0a9cc50662 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
0d139cc267 merge in klp-release history after reset to klp-dev 2013-09-12 06:01:29 -07:00