Commit Graph

926 Commits

Author SHA1 Message Date
Elliott Hughes
6e7affeb3d am b8292830: resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp
* commit 'b8292830f79fc76ffb9a1be5cd316212ac494d03':
  Switch frameworks/base over from @hidden Charsets to public StandardCharsets.
2013-06-28 16:53:27 -07:00
Elliott Hughes
a920f25fe5 resolved conflicts for merge of fca0f92e to stage-aosp-master
Change-Id: I4791f0ffa324a313b8390fbde6d8f82f716ecf74
2013-06-28 16:41:19 -07:00
Elliott Hughes
d396a448b2 Switch frameworks/base over from @hidden Charsets to public StandardCharsets.
Bug: 3484927
Change-Id: I5d136d2ee629588538602766a182ae14ce5fc63c
2013-06-28 16:24:48 -07:00
Kenny Root
b3933b979d am 67f7d8fb: am 6c042b6d: am a5a2de55: Merge "Add ALPN support to SSL socket factory"
* commit '67f7d8fbd5ad84681fbdfea184ce538c6834896a':
  Add ALPN support to SSL socket factory
2013-06-27 14:57:46 -07:00
Kenny Root
6c042b6d67 am a5a2de55: Merge "Add ALPN support to SSL socket factory"
* commit 'a5a2de55082b1f2a9ec0b99962a88063ac6d1bbf':
  Add ALPN support to SSL socket factory
2013-06-27 14:52:17 -07:00
Kenny Root
100d729026 Add ALPN support to SSL socket factory
This adds the ability to use Application-Layer Protocol Negotiation
(ALPN) through the SSLCertificateSocketFactory. ALPN is essentially
like Next Protocol Negotiation (NPN) but negotiation is done in the
clear. This allows the use of other protocols on the same port (e.g.,
SPDY instead of HTTP on port 80).

Change-Id: Ie62926b455e252c4c98670bbbecc1eb5c6f13990
2013-06-26 10:35:39 -07:00
Svetoslav Ganov
4b9a4d1687 Print - platform APIs
Related changes:
    Skia (inlcude PDF APIs): https://googleplex-android-review.googlesource.com/#/c/305814/
    Canvas to PDF: https://googleplex-android-review.googlesource.com/#/c/319367/
    Settings (initial version): https://googleplex-android-review.googlesource.com/#/c/306077/
    Build: https://googleplex-android-review.googlesource.com/#/c/292437/
    Sample print services: https://googleplex-android-review.googlesource.com/#/c/281785/

Change-Id: I104d12efd12577f05c7b9b2a5e5e49125c0f09da
2013-06-21 18:43:17 -07:00
Narayan Kamath
6db1054692 am 7d1fd557: am 372d21ad: am 6706ca96: Merge "Update HttpResponseCache to use the new cache API."
* commit '7d1fd557a3fd96365565531e5e45ac5e93dd8315':
  Update HttpResponseCache to use the new cache API.
2013-06-13 02:34:23 -07:00
Narayan Kamath
372d21ad69 am 6706ca96: Merge "Update HttpResponseCache to use the new cache API."
* commit '6706ca96b21ebbd620fb597a23e8180f76bb37cf':
  Update HttpResponseCache to use the new cache API.
2013-06-13 02:29:11 -07:00
Narayan Kamath
68a3cd7955 Update HttpResponseCache to use the new cache API.
The new API was introduced in

https://android-review.googlesource.com/#/c/59985/

Change-Id: Ie64de7fc64b818bebf1077dff407813865769387
2013-06-12 15:48:18 +01:00
Jeff Sharkey
fea17de7aa Explicit locale when formatting machine strings.
Bug: 9390451
Change-Id: I3581c53407554a1dffd541fb42b06d68f20a7be0
2013-06-11 14:36:41 -07:00
Jeff Sharkey
7a1c3fce47 Accumulate network statistics based on deltas.
Network stats are now read out of the kernel in one sweep, instead of
reading per-UID.  We now accumulate the delta traffic between each
stats snapshot using the well-tested SamplingCounter pattern.

Since Wi-Fi and mobile traffic have different costs, track each
separately.  Avoids counting misc interfaces like loopback and
ethernet under total.

Bug: 5543387
Change-Id: I642004dc530113c27ef79f2abbae51d8af30117f
2013-06-06 14:35:34 -07:00
Robert Greenwalt
777e2e8545 am a34b531b: Merge "EthernetDataTracker: Set network available on connected"
* commit 'a34b531bb6d2f2923f474b8c0a0c09149303e5d3':
  EthernetDataTracker: Set network available on connected
2013-05-15 10:41:54 -07:00
Robert Greenwalt
a34b531bb6 Merge "EthernetDataTracker: Set network available on connected" 2013-05-15 16:39:05 +00:00
Matthew Xie
389bf4b331 am 4f88ff48: Merge "Use the right fd for flush call" into jb-mr2-dev
* commit '4f88ff48ee99b5e7078f7a6b774d21a3f3434bb9':
  Use the right fd for flush call
2013-05-14 11:07:06 -07:00
Matthew Xie
d073bfdb3a Use the right fd for flush call
bug 8498784
Change-Id: I03d3a588b01825b868d4b0229c60b7bb3b24a5f6
2013-05-13 18:35:27 -07:00
Robert Greenwalt
8c04cd041d am 341666c4: Merge "Fix sync problem in NsdManager" into jb-mr2-dev
* commit '341666c40d222145f7dfd44bdbed48590c4dc5da':
  Fix sync problem in NsdManager
2013-05-06 11:12:02 -07:00
Robert Greenwalt
af2eefb701 Fix sync problem in NsdManager
The NsdManager init was thinking it was done before the AsyncChannel
was fully setup and if the setup were slow and the app fast, the app
could make calls to the NsdManager that it wasn't ready for.

bug:8545006
Change-Id: I2cb2a7c0a1c7f3d2b81ac0f66d37346e6d2d720d
2013-05-02 15:45:32 -07:00
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