Commit Graph

907 Commits

Author SHA1 Message Date
Kenny Root
e9ae6822a8 resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp
Change-Id: I06c05d637613215b6d83df3e29cd495f6a5a0176
2013-04-29 23:09:03 -07:00
Kenny Root
12e752225a Track change to JSSE provider
Change-Id: I35e824e47ad758ab6408e91e2ba5dcda053a82f5
2013-04-29 15:15:27 -07:00
Kenny Root
d334cb13d6 am d152f7ec: Merge "Don\'t use X509CertImpl directly"
* commit 'd152f7ec1ae43d77ff8e2206724ce71da3da9913':
  Don't use X509CertImpl directly
2013-04-29 14:16:09 -07:00
Kenny Root
28b1f0ee02 Don't use X509CertImpl directly
Change-Id: Ibabee35c90c2636c6f362e4d778d6795a0cef6c2
2013-04-29 13:27:39 -07:00
Matthew Xie
7a21c4cdb1 am 7f3c5d16: Merge "Added flush() for bluetooth output stream" into jb-mr2-dev
* commit '7f3c5d164fd34e77b783e8c09b65645a1b143f6a':
  Added flush() for bluetooth output stream
2013-04-25 21:22:29 -07:00
zzy
71bfafc84a Added flush() for bluetooth output stream
Bug 8498784

Zebra QL420 Plus Bluetooth printer fails on Android 4.2.2
2013-04-24 00:24:34 -07:00
Robert Greenwalt
f12afa9913 am d0202945: Merge "Listen for network disconnect." into jb-mr2-dev
* commit 'd020294572f591007de1fe0aa9e4927dae72c0c9':
  Listen for network disconnect.
2013-04-23 03:51:08 -07:00
Robert Greenwalt
d020294572 Merge "Listen for network disconnect." into jb-mr2-dev 2013-04-22 21:33:29 +00:00
Robert Greenwalt
1b0ca9dace Listen for network disconnect.
VPN used to just watch the interface, but that is insufficient.  There
is no promise that the interface will go down when we're done with it.
Now that wifi stays on in scan-only mode despite user turning it off
it seems that the interface is left up, even in AP mode.

Now listening for ConnectivityService broadcast that the network we were on
has disconnected and tearing down the VPN then or when the interface
goes away.

bug:8550083
Change-Id: Icf414497bc55bead69de04e91f39f90ac2e6578a
2013-04-22 14:13:51 -07:00
Robert Greenwalt
0460cb9ed6 am 88cec86e: Remove STOPSHIP and defer removal.
* commit '88cec86e882e27a9e35315553cc05fdf7f281a4e':
  Remove STOPSHIP and defer removal.
2013-04-19 10:17:41 -07:00
Robert Greenwalt
88cec86e88 Remove STOPSHIP and defer removal.
bug:8657300
Change-Id: Ia855fdc0db7a33502838648ee002d4929b224960
2013-04-19 09:31:24 -07:00
Robert Greenwalt
2d28d6229f am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev
* commit '3016244ffb0ee59a191b294839468a81b45a01f1':
  Add new route.hasGateway() api
2013-04-12 12:07:14 -07:00
Robert Greenwalt
ca441ee2f0 Add new route.hasGateway() api
Fixes issues brought in by change to isHostRoute.  isHostRoute
was technically correct, but the callers really wanted hasNextHop
behavior.

bug:8597268
Change-Id: I360761ccfa98b2ba34642f717a78fa71ec1bae4f
2013-04-12 11:22:52 -07:00
Robert Greenwalt
63582a790e am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev
* commit 'ccbe7e6ff16fe1afc08f0b8601d83481ba5aee3a':
  Use CONNECTIVITY_INTERNAL for global proxy
2013-04-11 14:16:28 -07:00
Robert Greenwalt
a9bebc2211 Use CONNECTIVITY_INTERNAL for global proxy
The Global http proxy shouldn't be used by apps, but can be useful in certain
conditions.

bug:8264794
bug:8557674
Change-Id: Ia3cbe542e448d9e74d0492626a13e9fd34ad797a
2013-04-10 15:32:18 -07:00
Jeff Sharkey
04e740a65e am 0f8e8b03: Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-dev
* commit '0f8e8b03ebb35040c299079adc1c351f37ce4885':
  Warn when exposing file:// Uris beyond a process.
2013-04-03 16:29:55 -07:00
Jeff Sharkey
0f8e8b03eb Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-dev 2013-04-03 23:28:07 +00:00
Brian Carlstrom
3c7df09d4d am 6fdcb168: Merge "Adjust the HttpResponseCache for OkHttp."
* commit '6fdcb168a7a0a4f508063019ca4d2ec35458f892':
  Adjust the HttpResponseCache for OkHttp.
2013-04-03 14:06:55 -07:00
jwilson
dea64ad715 Adjust the HttpResponseCache for OkHttp.
Change-Id: I2a80f3c3f30a3d15673d797fa3d1211286f75030
2013-04-03 20:15:36 +00:00
Jeff Sharkey
a14acd20b8 Warn when exposing file:// Uris beyond a process.
Check for file:// Uris inside Intents, ClipData, Notifications and
RemoteViews when StrictMode option is enabled.

Also introduces Intent.prepareToLeaveProcess() to uniformly handle
Intents about to leave an app process.

Bug: 8529070
Change-Id: I8efb43877cbc5f21eb029fc6492b3ee1415059ef
2013-04-03 11:45:44 -07:00
Lorenzo Colitti
213f98b6fe Fix LinkProperties's equals() method.
LinkProperties's equals() method was broken by the addition of
stacked interfaces. The reason was that equals() was checking
the equality of mStackedInterfaces.keys(), which is just an
enumeration, instead of mStackedInterfaces.keySet(), which
actually contains the keys. The test was failing, but I didn't
notice.

Fix the bug and make the test check the objects more in depth
so it can give more detailed error messages when equals() fails.

Bug: 8276725
Change-Id: Ie990bd75f641c28e63e54d953dcd0f4de13f7c9f
2013-04-02 10:08:59 +09:00
Robert Greenwalt
5acc8632a7 Merge "Add BT - DataTracker connection" into jb-mr2-dev 2013-03-28 16:45:33 +00:00
Wink Saville
224100f705 Merge "Cleanup some debug in LinkCapabilities and Properties." into jb-mr2-dev 2013-03-28 16:09:26 +00:00
Wink Saville
15bc62fe20 Cleanup some debug in LinkCapabilities and Properties.
Change-Id: I5fe0124d0943f5e538e451645f32533a74c75a47
2013-03-27 16:21:43 -07:00
Robert Greenwalt
665e1aed5e Add BT - DataTracker connection
Allows the external BT stack the means to communicate with
ConnectivityService during reverse tethering.

bug:8445208
Change-Id: Ice7dfb0b50c9481d359aed14a51372878185171c
2013-03-27 15:45:12 -07:00
Lorenzo Colitti
fdadc4e242 Make isHostRoute match only host routes
Currently, isHostRoute returns true iff the gateway address is
the unspecified address (0.0.0.0 or ::). Thus, it will return
true for any route that has no gateway (e.g., a route pointing at
a point-to-point interface), even if the route is not a host
route.

Fix this by checking the prefix length instead. This should be
safe because:

1. mDestination cannot be null, since it's created using new.
2. Host routes created using makeHostRoute (which is what
   ConnectivityService calls) always have the correct prefix
   lengths (/32 or /128) set.

Bug: 8276725
Change-Id: I14285398823fa6c312349128c7cc216cad4a84c9
2013-03-27 19:41:06 +09:00
Jeff Sharkey
dddace7582 Update TrafficStats docs to reflect behavior.
Bug: 8399623
Change-Id: If9ccd305e8a077f318a09ac1bb160b8efbf903aa
2013-03-26 13:46:09 -07:00
Robert Greenwalt
55187f1850 Prevent NPE in new API.
bug:8455284
Change-Id: I26ecbd024d1fe001f3af792c4e66409b2968c7ec
2013-03-22 12:00:17 -07:00
Lorenzo Colitti
4aa9bcf414 Reset connections on all stacked interfaces.
Bug: 8276725
Change-Id: I7fe99c6ea123037cef3e89e3c2c17ed43cc0b1ea
2013-03-20 19:22:58 +09:00
Robert Greenwalt
1afb71377c Revert of Ifd0c4081a. Turning off logging.
Found our bug, so switching the logging back off.
bug:8377625

Change-Id: I254bd83c48f1dd8dd62db1fcb162d460328169c5
2013-03-15 20:20:11 +00:00
Robert Greenwalt
1b36449830 Merge "Revert "Turn on more logging to find this bug."" into jb-mr2-dev 2013-03-15 19:19:46 +00:00
Robert Greenwalt
15dd5be47e Revert "Turn on more logging to find this bug."
This reverts commit bb5bcaaaed
bug:8377625
Change-Id: I9663a4646f7581c86b2303aec2655cbf3742fd80
2013-03-15 19:19:24 +00:00
Robert Greenwalt
6629bcd660 Don't return an unmod collection.
It's not needed as people can mess with this, and people do, so this fixes the build.
bug:8398355

Change-Id: Iddd00af41009c88b67fb7f9a8789bb416c377922
2013-03-15 11:28:50 -07:00
Robert Greenwalt
28cdf1dc22 Don't update routes if Dhcp fails.
bug:8377625
Change-Id: I11d2c29728078813bfb1245cc46e8cce2b307a2c
2013-03-15 10:48:46 -07:00
Lorenzo Colitti
69edd64d9b Add stacking to the NetworkStateTrackers.
Bug: 8276725
Change-Id: I55a107fea78f9cc84f15bd6c75292138fb35a1b6
2013-03-15 14:35:35 +09:00
Lorenzo Colitti
419a4ce9e4 Add stacked interfaces to LinkProperties.
Bug: 8276725
Change-Id: I2f592d4c690e9af0459ae742ab16107a10d89353
2013-03-15 14:35:32 +09:00
Robert Greenwalt
bb5bcaaaed Turn on more logging to find this bug.
bug:8377625
Change-Id: I0c086402122d45fc409d237a3b96d96146f1f74c
2013-03-14 10:37:56 -07:00
Robert Greenwalt
5ddeb9ed70 Add logging to track down bug
bug:8377625
Change-Id: Ifd0c4081a2f1238dbbc39c6904b993e2fb95455a
2013-03-13 16:38:46 -07:00
Lorenzo Colitti
1994bc14ab Unit test routes with interfaces in LinkProperties
Change-Id: Ie41a56bc9863ee72f4d7a8f72e436fc57e57b1af
2013-03-12 15:01:05 -07:00
Kenny Root
ae19d2cac8 am f3e3a7fd: am 7ad51409: Merge "Switch TLS Channel ID API from ECPrivateKey to PrivateKey."
* commit 'f3e3a7fd3cc386b69ae3275b829ddd0d137fcac5':
  Switch TLS Channel ID API from ECPrivateKey to PrivateKey.
2013-03-12 13:27:13 -07:00
Alex Klyubin
ac5eb03a7c Switch TLS Channel ID API from ECPrivateKey to PrivateKey.
This is to accept both the "transparent" and "opaque" ECC private
keys. "Transparent" keys provide structured access to their key
material -- these are instances of ECPrivateKey. "Opaque" private
keys are not required to provide structured (or even any) access to
their key material -- these are instances of PrivateKey.

Change-Id: Ib22e18b45b638b429f994ed965416c753226c4ee
2013-03-12 10:33:13 -07:00
Lorenzo Colitti
574b00a362 Unbreak documentation build.
Change-Id: I1e904b111e23d221dcb5f917201d4c27f0c1c05b
2013-03-12 04:30:47 +09:00
Lorenzo Colitti
e167135976 Always specify an interface for host routes.
Change-Id: I05b4d87e7d7e8237c6f4a70f1fedae00f416f581
2013-03-08 16:41:25 -08:00
Lorenzo Colitti
45b9a5bb93 RouteInfo changes.
- Add the interface name.
- Fix a bug where a default route would match an address of
  another protocol (e.g., 0.0.0.0/0 would match 2001::).
- Tweak the hashCode method.
- Write a unit test.

Change-Id: Ida8266de440a9b1d9eaa132f182b9f1ce8978c44
2013-03-08 16:41:25 -08:00
Robert Greenwalt
7316cd83db Revert "Add default route constants to RouteInfo."
This reverts commit 642eb63a65

Change-Id: Ide6d7f3b935da41477b736ef0ef20ec9872563e1
2013-03-07 20:11:18 +00:00
Lorenzo Colitti
642eb63a65 Add default route constants to RouteInfo.
Bug: 8276725
Change-Id: I9c3ad7393430de9275f5b1c0189a94e5a27975fc
2013-03-07 11:08:08 -08:00
Dianne Hackborn
45e9ede55f Add version code constant for JB MR2.
Change-Id: I60fc76bbeb3c5e85d716179e9e3ea5758bafaf69
2013-02-25 15:55:37 -08:00
Robert Greenwalt
5a6bdc46e2 Improve ConnectivityManager docs
Also fix some permission problems.
bug:5738328

Change-Id: Ib32c223f425b1fc03b8cce528456bcb50b540fdf
2013-02-22 10:39:20 -08:00
Jeff Sharkey
4fa63b2d5e Improve notification UI for lockdown VPN.
Bug: 7064111
Change-Id: I9554f6a426697b4abeb2ddd0827d314920e88ed6
2013-02-21 09:47:11 -08:00
Russell Brenner
108da0cfa4 Adjust captive portal test for setup wizard
During setup wizard, perform captive portal test without the typical
delays.

Change-Id: If596948e732966817aae6201440e87e19be0c2f8
2013-02-14 11:02:10 -08:00