Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,182 Commits 3 Branches 0 Tags
757ec7837db85eae675cda5cfaf94040268327fd
Commit Graph

942 Commits

Author SHA1 Message Date
Mike Lockwood
757ec7837d Merge "LocalSocket: Add support for SOCK_DGRAM and SOCK_SEQPACKET" 2013-07-19 17:39:28 +00:00
Christopher Tate
3e07a89b2c Fix build & preserve DHCP scheduling as-is 
Change-Id: I4063b18532c476280f343658bf3641495e526ed4
 2013-07-18 18:23:57 -07:00
Elliott Hughes
5bc32b347f am 03a152d7: am 15cb526e: Merge "Fix import after okhttp update." 
* commit '03a152d7e72f05456a463f2709ce787119e86f03':
  Fix import after okhttp update.
 2013-07-18 09:43:04 -07:00
Elliott Hughes
03a152d7e7 am 15cb526e: Merge "Fix import after okhttp update." 
* commit '15cb526ece1420b1ae2061e20fd0982d82b41aae':
  Fix import after okhttp update.
 2013-07-18 09:36:48 -07:00
Narayan Kamath
c0bb16673e Fix import after okhttp update. 
OkResponseCache moved packages in change
62321.

Change-Id: I2c08c4586405e767d1931ebc5f185c7916850fa1
 2013-07-18 13:42:50 +01:00
Mike Lockwood
e7d309a929 LocalSocket: Add support for SOCK_DGRAM and SOCK_SEQPACKET 
Also replaced some JNI code with libcore IO support

Change-Id: I091e2b6b8dd1fec554936c1ffab29e50f0979e4a
 2013-07-16 17:31:15 -07:00
Chad Brubaker
d1c87546b3 Move markSocketAsUser to the top of IConnectivityManager.aidl 
Move markSocketAsUser to the top of IConnectivityManager.aidl to make
calls from
framework/native/services/connectivitymanager less fragile

Change-Id: Iba92c21dfef175b570521f34e7ee2732e5a0a9c9
 2013-07-16 11:29:11 -07:00
Chad Brubaker
d475c70424 Support routing sockets as another user 
Add support for routing sockets as if they were another user's.
This is for services that handle delegated network tasks like MediaServer and DownloadManager.

Change-Id: Id20efc1f5c2cce6f8838d777762f6c0a703a9437
 2013-07-15 12:14:10 -07:00
Chad Brubaker
4ca19e8377 Add per user VPN support 
VPNs are now per user instead of global. A VPN set by user A routes only
user A's traffic and no other user can access it.

Change-Id: Ia66463637b6bd088b05768076a1db897fe95c46c
 2013-07-12 20:51:03 -07:00
Chad Brubaker
12324b4604 Add NetworkUtil function for marking sockets 
Add NetworkUtil function for setting the SO_MARK field of sockets

Change-Id: I94389b64296d87ee928293f24a26f8dd08c3bf37
 2013-07-12 19:48:32 +00:00
Jeff Sharkey
84b2dd8927 am df04f644: am f8b69275: am 1f99a483: Recover from corrupt network stats. 
* commit 'df04f64434f3310d3eb71d332935616fcdc497a2':
  Recover from corrupt network stats.
 2013-07-11 14:23:28 -07:00
Jeff Sharkey
df04f64434 am f8b69275: am 1f99a483: Recover from corrupt network stats. 
* commit 'f8b692754f7739e11c8438ab59c0760194cfacc5':
  Recover from corrupt network stats.
 2013-07-11 11:41:24 -07:00
Jeff Sharkey
1f99a483e4 Recover from corrupt network stats. 
When encountering corrupt stats, throw as IOException to allow
recovery at a higher level.

Bug: 9794832
Change-Id: I38d000b3bd8a4c99389c40a87ee0699efb6e9049
 2013-07-11 11:18:53 -07:00
Wink Saville
9f6a7f424f Merge commit '3b5d686e' into fix-merge-conflict 
* commit '3b5d686e':
  Add checkMobileProvisioning to ConnectivityService.

Conflicts:
	services/java/com/android/server/ConnectivityService.java

Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458
 2013-07-01 16:12:31 -07:00
Wink Saville
3b5d686e68 am c45f2e05: am 59046f40: Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-dev 
* commit 'c45f2e05e3b9d261009c66346ef2257ec105f05c':
  Add checkMobileProvisioning to ConnectivityService.
 2013-07-01 15:41:31 -07:00
Wink Saville
ab9321d13d Add checkMobileProvisioning to ConnectivityService. 
Bug: 9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
 2013-06-29 21:10:57 -07:00
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