Commit Graph

961 Commits

Author SHA1 Message Date
Jason Monk
602b232a06 Add PAC File support for proxy configuration
PAC (Proxy auto-config) files contain a single javascript function,
FindProxyForURL(url, host).  It gets called to determine what proxy should be
used for a specific request.

This adds PAC support to the system.  The ProxyProperties has been modified
to hold the PAC file when one is present.  The Proxy method
setHttpProxySystemProperty has been modified to insert a PacProxySelector
as the default ProxySelector when it is required.  This new ProxySelector
makes calls to the ConnectivityService to parse the PAC file.

The ConnectivityService and the WifiConfigStore have been modified to support
saving the extra PAC file data.

The ConnectivityService now has a class attached (PacProxyNative) that
interfaces to the native calls for PAC files.  The parsing of the PAC file
is handled by libpac (which is being added to external/) which utilizes
libv8 to parse the javascript.

As a fallback to applications that don't use the java ProxySelector,  the proxy
is setup to point to a local proxy server that will handle the pac parsing.

bug:10182711
Change-Id: I5eb8df893c632fd3e1b732385cb7720ad646f401
2013-08-07 21:01:39 -04:00
Brian Williammee
1ed51627d9 Track latency of captive portal checks
When captive portal check occurs, track its latency, whether or not
we received a response, and whether or not the response was a captive
portal.  Pair with information identifying the access point / base
station, and broadcast it (with a system|signature-protected
permission).

Broadcast only occurs if user has consented to
Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE.

Change-Id: I6fd59954a7ee2cc7acedf064a1465882653b2173
2013-08-06 16:32:44 -07:00
Elliott Hughes
89a8250e24 am 710f3e2c: am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."
* commit '710f3e2cc6bc2cdc2f2cddb2190823ea31efd52a':
  If frameworks wants ASCII casing, it should explicity ask for it.
2013-08-02 17:58:33 -07:00
Elliott Hughes
710f3e2cc6 am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."
* commit '60ae2617b4b304fc3e45a441f87d1765714477ba':
  If frameworks wants ASCII casing, it should explicity ask for it.
2013-08-02 17:41:57 -07:00
Elliott Hughes
cb64d43062 If frameworks wants ASCII casing, it should explicity ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Iaab02e718a7be7bda22e626dca05d79bfd2a8fc4
2013-08-02 15:12:32 -07:00
Lorenzo Colitti
e1cd293151 Merge "Add accessors for all addresses and clarify compare* methods" 2013-08-01 06:44:29 +00:00
Wink Saville
1aef7fc81a Fix excessive log spew.
Bug: 10115060
Change-Id: I61fd83071da1224f38757b8d90f58c8d6c41d36b
2013-07-31 15:49:04 -07:00
Lorenzo Colitti
d1e0fae2bc Add accessors for all addresses and clarify compare* methods
1. Add a method to return all addresses and all LinkAddresses on
   all links (both base links and stacked links). We already had
   one for routes, but did not yet have any for addresses.
2. Rename compareRoutes to compareAllRoutes, because unlike the
   other compare* methods, it looks at all interfaces. Update
   what appears to be its only caller.
3. Update the documentation of the compare* methods to match
   reality (they don't return lists) and clarify whether they
   look at all links or only the base link.

Change-Id: Ie22e6c7f163d5de8e407248b45171dc28382d2d3
2013-08-01 00:21:24 +09:00
Wink Saville
5e56bc5437 Add network type TYPE_MOBILE_IA.
Add a network type for establishing connections to the apn used for
the initial connection.

Enable some debug for now.

Bug: 8733613
Change-Id: Ia627ac0cf5715660b6d02bb13a83d46ec1727b87
2013-07-29 15:02:29 -07:00
Zhihai Xu
118c85156a Bluetooth stopped working in master - "bad file descriptor"
only close file descriptor which is created internally for LocalSocketImpl

bug:9960585
Change-Id: I79492a05cc7c81ae6e134058840d5ca0b7663795
2013-07-25 13:44:50 -07:00
Kenny Root
e79b9280f0 Merge "Use hostname verifier directly instead of instance" 2013-07-24 06:51:29 +00:00
Kenny Root
928ee1e48f Use hostname verifier directly instead of instance
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.

Bug: 9984058
Change-Id: I780249dbd3c7bb346e1b275dcb68e4e2be7ebbbb
2013-07-23 20:46:24 -07:00
Geremy Condra
5830e07521 Merge "Fix supplimentary network connections with VPNs" 2013-07-23 17:58:33 +00:00
Geremy Condra
1b6868cc4b Merge "Support multiple Vpn ManageDialogs" 2013-07-23 17:55:45 +00:00
Chad Brubaker
f336d722c7 Fix supplimentary network connections with VPNs
Enables the use of supplimentary mobile networks like MMS, and HIPRI
while VPNs are running.

Change-Id: I313f57a905b4e16bd4322c68687cbff1cfbe9d3e
2013-07-19 15:57:05 -07:00
Robert Greenwalt
538cdb98ef resolved conflicts for merge of 85b5e4c4 to master
Change-Id: Idd0ad9b1504fddf68c4c4cc04731de1eddd204b3
2013-07-19 14:09:30 -07:00
Robert Greenwalt
85b5e4c48f am b5bf655c: am e874bd35: Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
* commit 'b5bf655cc6cc9128aec99958cce3b054348c9273':
  Add gservices updater for carrier provisioning url
2013-07-19 13:37:41 -07:00
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
Robert Greenwalt
e182bfe398 Add gservices updater for carrier provisioning url
bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
2013-07-17 14:05:33 -07:00
Chad Brubaker
bf6ff2c025 Support multiple Vpn ManageDialogs
Move away from storing the configs in the Intent to prevent issues with
PendingIntents and multiple configs.

The Dialog now queries ConnectivityService for the configuration to
display in the management dialog.

Change-Id: I0e0ef52db840152914d117a24f776d8106e836ff
2013-07-16 18:59:12 -07: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