Commit Graph

1136 Commits

Author SHA1 Message Date
Lorenzo Colitti
6ee1306c53 am 48a93c46: am 9d4ac970: Merge "Pass DNS server info notifications to observers."
* commit '48a93c46f390d2cd74c9bce61121386f93bde13a':
  Pass DNS server info notifications to observers.
2013-11-26 08:48:34 -08:00
Lorenzo Colitti
3b6f820e6b am 4eeb8ad4: am eede7e89: Merge "Minor cleanups to NetdCallbackReceiver.onEvent."
* commit '4eeb8ad49491ccb155e171ca89cb89c337e7723c':
  Minor cleanups to NetdCallbackReceiver.onEvent.
2013-11-26 08:48:30 -08:00
Lorenzo Colitti
48a93c46f3 am 9d4ac970: Merge "Pass DNS server info notifications to observers."
* commit '9d4ac9703657142b190d3c256de7c3329e5a4b29':
  Pass DNS server info notifications to observers.
2013-11-26 08:38:48 -08:00
Lorenzo Colitti
4eeb8ad494 am eede7e89: Merge "Minor cleanups to NetdCallbackReceiver.onEvent."
* commit 'eede7e89c94b3bb56c26aec137c53d592d3bc7c3':
  Minor cleanups to NetdCallbackReceiver.onEvent.
2013-11-26 08:38:45 -08:00
Lorenzo Colitti
ea5c0e2c48 Pass DNS server info notifications to observers.
These are sent if the device receives IPv6 Router Advertisements
with DNS server configuration options. Currently, nothing listens
to them; in a future change we will use them as IPv6 DNS servers.

[Cherry-pick of d3b7821c8f]

Bug: 9180552
Change-Id: I05000c0cd3867a68ab390102e8470b6912a9d3aa
2013-11-25 17:27:17 +09:00
Lorenzo Colitti
1f7e433a86 Minor cleanups to NetdCallbackReceiver.onEvent.
- Clean up identical error messages.
- Fix the array length check for InterfaceAddressChange.

[Cherry-pick of 4f85a08091]

Bug: 9180552
Change-Id: Id871f481445b530c3ad749725f1548df0e3a1228
2013-11-25 17:25:45 +09:00
The Android Open Source Project
2c3004bf9e am ac29b5a6: am b4c0ead9: (-s ours) Merge commit \'b873a17ce7be0a9771c24999adca6964431728f6\' into HEAD
* commit 'ac29b5a6746279f156f9471633498f29e39c14ff':
2013-11-22 19:31:23 -08:00
The Android Open Source Project
ac29b5a674 am b4c0ead9: (-s ours) Merge commit \'b873a17ce7be0a9771c24999adca6964431728f6\' into HEAD
* commit 'b4c0ead90f29f49cf494aa1d39a143b417e62545':
2013-11-22 17:40:32 -08:00
The Android Open Source Project
b4c0ead90f Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD
Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
2013-11-22 11:18:57 -08:00
Lorenzo Colitti
3b49b08e33 Merge "Pass DNS server info notifications to observers." 2013-11-22 01:27:15 +00:00
John Spurlock
10cbbeebcc Remove unused imports from frameworks/base.
Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
2013-11-20 11:31:47 -05:00
Robert Greenwalt
2b1ac58fdf am 6668bcdc: am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev
* commit '6668bcdc88226c2f36f5ba4084661477e0e517c4':
  Fix NPE in ConnectivityService
2013-11-18 10:37:51 -08:00
Robert Greenwalt
6668bcdc88 am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev
* commit 'a8a448da25c62f54cac3318c17c69e851a4ecde9':
  Fix NPE in ConnectivityService
2013-11-18 10:33:46 -08:00
Robert Greenwalt
cf8c894ef3 Fix NPE in ConnectivityService
bug:11727708
Change-Id: Ia8ca9d1e23f021feaf4b772ec38d1d0e89b0cd2a
2013-11-18 09:43:59 -08:00
Lorenzo Colitti
d3b7821c8f Pass DNS server info notifications to observers.
These are sent if the device receives IPv6 Router Advertisements
with DNS server configuration options. Currently, nothing listens
to them; in a future change we will use them as IPv6 DNS servers.

Bug: 9180552
Change-Id: I05000c0cd3867a68ab390102e8470b6912a9d3aa
2013-11-18 12:04:14 +09:00
Robert Greenwalt
bfe9d334c4 am 989bbbdd: resolved conflicts for merge of 639aed71 to klp-dev-plus-aosp
* commit '989bbbdddc450a8e380b5f5318bb6e38a89637ae':
  Fix for the invalid Global Proxy Setting
2013-11-13 18:48:31 -08:00
Robert Greenwalt
8fa42e3cfb am 2a1fb433: am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev
* commit '2a1fb433e5ed5d5fd52f7018483481fc6aac9435':
  Fix for the invalid Global Proxy Setting
2013-11-13 18:47:57 -08:00
Robert Greenwalt
989bbbdddc resolved conflicts for merge of 639aed71 to klp-dev-plus-aosp
Change-Id: I220a034cf3293a4a29d8683f20812adac112bddd
2013-11-13 17:50:35 -08:00
Robert Greenwalt
2a1fb433e5 am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev
* commit '4c514f2a688bdae319c919987092ccfee690f390':
  Fix for the invalid Global Proxy Setting
2013-11-13 16:29:12 -08:00
Robert Greenwalt
639aed7172 am 3d666581: Merge "Fix for the invalid Global Proxy Setting"
* commit '3d66658106600473851b8b868b20b8c11fad8c7d':
  Fix for the invalid Global Proxy Setting
2013-11-13 16:27:56 -08:00
Robert Greenwalt
3d66658106 Merge "Fix for the invalid Global Proxy Setting" 2013-11-14 00:23:04 +00:00
Raj Mamadgi
08e512b425 Fix for the invalid Global Proxy Setting
Adding validation for Global Proxy setting before it is
being set.

Proxy is validated at the boot time also to make sure
the value set is valid.

Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>
bug:11598568

Change-Id: Idff5ae81119d8143da096b5291ecbfbc5875cbd4
2013-11-14 00:08:21 +00:00
Robert Greenwalt
f4f53e0f33 am b6344cef: am 48eded0e: am 18490abd: Merge "Fix NPE in ConnectivityService"
* commit 'b6344cefc4ebdcbb050681a569f2933704a00a77':
  Fix NPE in ConnectivityService
2013-11-13 10:33:56 -08:00
Robert Greenwalt
b6344cefc4 am 48eded0e: am 18490abd: Merge "Fix NPE in ConnectivityService"
* commit '48eded0e8fdf594cb53c4137c7cc62d90af87f97':
  Fix NPE in ConnectivityService
2013-11-13 10:27:46 -08:00
Robert Greenwalt
48eded0e8f am 18490abd: Merge "Fix NPE in ConnectivityService"
* commit '18490abd9bcb401f0d75a314056fb2a44dd61f07':
  Fix NPE in ConnectivityService
2013-11-13 10:25:30 -08:00
Ken Mixter
7caa36a51a 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
Raj Mamadgi
6bc5edab73 Fix for the invalid Global Proxy Setting
b/11598568

Adding validation for Global Proxy setting before it is
being set.

Proxy is validated at the boot time also to make sure
the value set is valid.

Change-Id: Ib93d24a80af1a329694f07c47bd81dfcc1e1b874
Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>
2013-11-12 21:14:02 -05:00
Lorenzo Colitti
4f85a08091 Minor cleanups to NetdCallbackReceiver.onEvent.
- Clean up identical error messages.
- Fix the array length check for InterfaceAddressChange.

Bug: 9180552
Change-Id: Id871f481445b530c3ad749725f1548df0e3a1228
2013-11-04 18:30:20 +09:00
Wink Saville
36379d0545 am 9f6d0280: am 6952b6fa: am b4f673e2: Merge "Use HttpsURLConnection to by pass proxies." into klp-dev
* commit '9f6d0280880562c891e64755b101f3d580e1b73e':
  Use HttpsURLConnection to by pass proxies.
2013-10-31 14:29:10 -07:00
Wink Saville
9f6d028088 am 6952b6fa: am b4f673e2: Merge "Use HttpsURLConnection to by pass proxies." into klp-dev
* commit '6952b6fac5930d3278f0103280f1ac9348d27a79':
  Use HttpsURLConnection to by pass proxies.
2013-10-31 14:23:41 -07:00
Wink Saville
8fe05f16a4 Use HttpsURLConnection to by pass proxies.
In isMobileOk attempting to connect to clients3.google.com/generate_204 we
sometimes see a proxy server will not let the connection go to our
server and instead returns 200 instead of 204. By using Https we by pass
proxy servers and we will always connected to our server.

The number of loops is increased from 3 to 4 and half the the retires
will use Http and half will use Https.

I also, added mTestingFailures which can be set to true by setting
persist.checkmp.testfailures to 1. This will cause checkMobileProvisiong
to always fail so we can test https & http.

Bug: 9972012
Change-Id: I870606037dcffe5250843980517ac52218266e02
2013-10-31 06:35:22 -07:00
Andrew Flynn
2f158287c3 Check for presence of carrier app in data notification.
When ConnectivityService checks the mobile data connection and notices that
there is no connectivity, first do a check to see if a valid carrier app for
the current MCC/MNC exists. If so, launch that app instead of checking for a
provisioning URL or hoping for a DNS redirect in the browser. If no such app
exists, continue on as normal.

Bug: 9622645
Change-Id: Ic88b06250af89825d8eee7e4945fb8d7c28d16e1
2013-10-26 11:04:32 -07:00
Robert Greenwalt
2e3db0c19a am 11ea8afe: am 20c811dd: am 72c4d609: Merge "Change how we use provisioning url so post works" into klp-dev
* commit '11ea8afec718509a654e3d4ea16813fbb6d93903':
  Change how we use provisioning url so post works
2013-10-17 16:13:24 -07:00
Robert Greenwalt
11ea8afec7 am 20c811dd: am 72c4d609: Merge "Change how we use provisioning url so post works" into klp-dev
* commit '20c811dd3b2191aa213337cf06ab5b34f85ee7fe':
  Change how we use provisioning url so post works
2013-10-17 16:09:32 -07:00
Robert Greenwalt
72c4d60926 Merge "Change how we use provisioning url so post works" into klp-dev 2013-10-17 23:00:42 +00:00
Robert Greenwalt
ac8d55abeb Change how we use provisioning url so post works
Needed to do an http post instead of a get for one carrier.
Do this by putting an auto-submitting form in the data to be
interpreted as a html doc by the browser.  The ACTION_VIEW
intent only works on http uri, but by specifying ACTION_MAIN/
CATEGORY_APP_BROWSER we could use data:text/html.

bug:11168810
Change-Id: Ifd33e1c3c7f9f40b6add39e446e6a7d7cde22549
2013-10-17 12:46:52 -07:00
Ed Heyl
25323fac95 am 15af1a12: am e704c3c9: am 41e6e50c: merge in klp-release (no-op)
* commit '15af1a1207abdb88b30e83545632edbfb8ca4899': (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
15af1a1207 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
605bb642f0 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
caa5f0e86b merge in klp-release history after reset to klp-dev 2013-10-15 21:14:08 -07:00
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
The Android Automerger
75930bca78 merge in klp-release history after reset to klp-dev 2013-10-13 06:01:56 -07: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
Dianne Hackborn
5b18a40d3a Fix issue #11113111: dumpsys activity service is broken
Change-Id: Ie02d27b377c562085ef7eb5dea144ce2f382c11d
2013-10-09 14:34:04 -07:00
The Android Automerger
87921134ed merge in klp-release history after reset to klp-dev 2013-10-09 06:01:14 -07: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