Commit graph

13,045 commits

Message SHA1
am 8a49a518: Merge commit \'bac61807d3bcfff957b358cb9ad77850bd373689\' into HEAD
* commit '8a49a518c5':

The Android Open Source Project   authored and   Android Git Automerger   commited 2013-12-05 17:27:10 -08:00
35e36de659
Merge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEAD
Change-Id: I29374270c8e0c2f2859efaf1d55af9f73da0f8d7

The Android Open Source Project   commited 2013-12-05 13:10:46 -08:00
8a49a518c5
am 13d9dfb4: am e097407f: am 8fc3d9a2: Merge "Minor changes to LinkAddress."
* commit '13d9dfb495db1431623c712b36cac1fe2f3c2fc0':
  Minor changes to LinkAddress.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2013-12-04 01:35:11 +00:00
a9f3961f77
am 8fc3d9a2: Merge "Minor changes to LinkAddress."
* commit '8fc3d9a2d9':
  Minor changes to LinkAddress.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2013-12-03 17:26:06 -08:00
e097407f80
Merge "Minor changes to LinkAddress."
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2013-12-04 01:21:07 +00:00
8fc3d9a2d9
Minor changes to LinkAddress.
1. Simplify the parceling code. Since the InetAddress inside a
   LinkAddress can never be null, we don't need to special-case
   the case where it is.
2. Add / update method documentation.
3. Write a unit test.

Change-Id: Iba0a8cecc683d55d736419965e72ee33dd66dc22

Lorenzo Colitti   commited 2013-12-03 19:46:36 +09:00
64eb7fdb64
am 025b1edc: am f226bc60: Merge "Use LinkAddress in address notifications."
* commit '025b1edcd9':
  Use LinkAddress in address notifications.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2013-12-02 20:53:06 +00:00
ff6daa9aff
am f226bc60: Merge "Use LinkAddress in address notifications."
* commit 'f226bc606af9ce5aceff6b05fc4b0200c94cb248':
  Use LinkAddress in address notifications.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2013-11-26 17:56:45 -08:00
025b1edcd9
am 48a93c46: am 9d4ac970: Merge "Pass DNS server info notifications to observers."
* commit '48a93c46f3':
  Pass DNS server info notifications to observers.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2013-11-26 08:48:34 -08:00
6ee1306c53
am 4eeb8ad4: am eede7e89: Merge "Minor cleanups to NetdCallbackReceiver.onEvent."
* commit '4eeb8ad494':
  Minor cleanups to NetdCallbackReceiver.onEvent.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2013-11-26 08:48:30 -08:00
3b6f820e6b
am 9d4ac970: Merge "Pass DNS server info notifications to observers."
* commit '9d4ac9703657142b190d3c256de7c3329e5a4b29':
  Pass DNS server info notifications to observers.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2013-11-26 08:38:48 -08:00
48a93c46f3
am eede7e89: Merge "Minor cleanups to NetdCallbackReceiver.onEvent."
* commit 'eede7e89c94b3bb56c26aec137c53d592d3bc7c3':
  Minor cleanups to NetdCallbackReceiver.onEvent.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2013-11-26 08:38:45 -08:00
4eeb8ad494
Use LinkAddress in address notifications.
Currently address{Updated,Removed} pass in the address as a
string such as "fe80::1/64". Use LinkAddresses instead, since
that's what it is.

This makes the code more robust in the unlikely case that netd
passes in an invalid string. In the future we can move flags and
scope into the LinkAddress itself and simplify the code further.

Bug: 9180552
Change-Id: I66599f9529cf421caa7676fdd0141bb110b8589e

Lorenzo Colitti   commited 2013-11-26 21:55:15 +09:00
3ac3fea4e7
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

Lorenzo Colitti   commited 2013-11-25 17:27:17 +09:00
ea5c0e2c48
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

Lorenzo Colitti   commited 2013-11-25 17:25:45 +09:00
1f7e433a86
am ac29b5a6: am b4c0ead9: (-s ours) Merge commit \'b873a17ce7be0a9771c24999adca6964431728f6\' into HEAD
* commit 'ac29b5a674':

The Android Open Source Project   authored and   Android Git Automerger   commited 2013-11-22 19:31:23 -08:00
2c3004bf9e
am b4c0ead9: (-s ours) Merge commit \'b873a17ce7be0a9771c24999adca6964431728f6\' into HEAD
* commit 'b4c0ead90f':

The Android Open Source Project   authored and   Android Git Automerger   commited 2013-11-22 17:40:32 -08:00
ac29b5a674
Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD
Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd

The Android Open Source Project   commited 2013-11-22 11:18:57 -08:00
b4c0ead90f
Merge "Pass DNS server info notifications to observers."
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2013-11-22 01:27:15 +00:00
3b49b08e33
Remove unused imports from frameworks/base.
Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906

John Spurlock   commited 2013-11-20 11:31:47 -05:00
10cbbeebcc
am 6668bcdc: am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev
* commit '6668bcdc88':
  Fix NPE in ConnectivityService

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-11-18 10:37:51 -08:00
2b1ac58fdf
am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev
* commit 'a8a448da25c62f54cac3318c17c69e851a4ecde9':
  Fix NPE in ConnectivityService

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-11-18 10:33:46 -08:00
6668bcdc88
Fix NPE in ConnectivityService
bug:11727708
Change-Id: Ia8ca9d1e23f021feaf4b772ec38d1d0e89b0cd2a

Robert Greenwalt   commited 2013-11-18 09:43:59 -08:00
cf8c894ef3
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

Lorenzo Colitti   commited 2013-11-18 12:04:14 +09:00
d3b7821c8f
am 989bbbdd: resolved conflicts for merge of 639aed71 to klp-dev-plus-aosp
* commit '989bbbdddc':
  Fix for the invalid Global Proxy Setting

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-11-13 18:48:31 -08:00
bfe9d334c4
am 2a1fb433: am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev
* commit '2a1fb433e5':
  Fix for the invalid Global Proxy Setting

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-11-13 18:47:57 -08:00
8fa42e3cfb
resolved conflicts for merge of 639aed71 to klp-dev-plus-aosp
Change-Id: I220a034cf3293a4a29d8683f20812adac112bddd

Robert Greenwalt   commited 2013-11-13 17:50:35 -08:00
989bbbdddc
am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev
* commit '4c514f2a688bdae319c919987092ccfee690f390':
  Fix for the invalid Global Proxy Setting

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-11-13 16:29:12 -08:00
2a1fb433e5
am 3d666581: Merge "Fix for the invalid Global Proxy Setting"
* commit '3d66658106':
  Fix for the invalid Global Proxy Setting

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-11-13 16:27:56 -08:00
639aed7172
Merge "Fix for the invalid Global Proxy Setting"
Robert Greenwalt   authored and   Gerrit Code Review   commited 2013-11-14 00:23:04 +00:00
3d66658106
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

Raj Mamadgi   authored and   Robert Greenwalt   commited 2013-11-14 00:08:21 +00:00
08e512b425
am b6344cef: am 48eded0e: am 18490abd: Merge "Fix NPE in ConnectivityService"
* commit 'b6344cefc4':
  Fix NPE in ConnectivityService

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-11-13 10:33:56 -08:00
f4f53e0f33
am 48eded0e: am 18490abd: Merge "Fix NPE in ConnectivityService"
* commit '48eded0e8f':
  Fix NPE in ConnectivityService

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-11-13 10:27:46 -08:00
b6344cefc4
am 18490abd: Merge "Fix NPE in ConnectivityService"
* commit '18490abd9bcb401f0d75a314056fb2a44dd61f07':
  Fix NPE in ConnectivityService

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-11-13 10:25:30 -08:00
48eded0e8f
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

Ken Mixter   commited 2013-11-12 22:17:46 -08:00
7caa36a51a
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>

Raj Mamadgi   authored and   Ankit Somani   commited 2013-11-12 21:14:02 -05:00
6bc5edab73
Minor cleanups to NetdCallbackReceiver.onEvent.
- Clean up identical error messages.
- Fix the array length check for InterfaceAddressChange.

Bug: 9180552
Change-Id: Id871f481445b530c3ad749725f1548df0e3a1228

Lorenzo Colitti   commited 2013-11-04 18:30:20 +09:00
4f85a08091
am 9f6d0280: am 6952b6fa: am b4f673e2: Merge "Use HttpsURLConnection to by pass proxies." into klp-dev
* commit '9f6d028088':
  Use HttpsURLConnection to by pass proxies.

Wink Saville   authored and   Android Git Automerger   commited 2013-10-31 14:29:10 -07:00
36379d0545
am 6952b6fa: am b4f673e2: Merge "Use HttpsURLConnection to by pass proxies." into klp-dev
* commit '6952b6fac5930d3278f0103280f1ac9348d27a79':
  Use HttpsURLConnection to by pass proxies.

Wink Saville   authored and   Android Git Automerger   commited 2013-10-31 14:23:41 -07:00
9f6d028088
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

Wink Saville   commited 2013-10-31 06:35:22 -07:00
8fe05f16a4
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

Andrew Flynn   commited 2013-10-26 11:04:32 -07:00
2f158287c3
am 11ea8afe: am 20c811dd: am 72c4d609: Merge "Change how we use provisioning url so post works" into klp-dev
* commit '11ea8afec7':
  Change how we use provisioning url so post works

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-10-17 16:13:24 -07:00
2e3db0c19a
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

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-10-17 16:09:32 -07:00
11ea8afec7
Merge "Change how we use provisioning url so post works" into klp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2013-10-17 23:00:42 +00:00
72c4d60926
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

Robert Greenwalt   commited 2013-10-17 12:46:52 -07:00
ac8d55abeb
am 15af1a12: am e704c3c9: am 41e6e50c: merge in klp-release (no-op)
* commit '15af1a1207': (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.
  ...

Ed Heyl   authored and   Android Git Automerger   commited 2013-10-16 18:07:23 -07:00
25323fac95
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.
  ...

Ed Heyl   authored and   Android Git Automerger   commited 2013-10-16 18:01:53 -07:00
15af1a1207
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

Narayan Kamath   commited 2013-10-16 08:10:55 +00:00
605bb642f0
merge in klp-release history after reset to klp-dev
The Android Automerger   commited 2013-10-15 21:14:08 -07:00
caa5f0e86b
am 680a35ba: am ec4d5da6: am 1b7f99b9: Merge "Retry captiveportal check even if only one addr" into klp-dev
* commit '680a35ba19':
  Retry captiveportal check even if only one addr

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-10-15 17:41:03 -07:00
252b3e6f51