Commit Graph

840 Commits

Author SHA1 Message Date
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
Robert Greenwalt
a34b531bb6 Merge "EthernetDataTracker: Set network available on connected" 2013-05-15 16:39:05 +00:00
Kenny Root
12e752225a Track change to JSSE provider
Change-Id: I35e824e47ad758ab6408e91e2ba5dcda053a82f5
2013-04-29 15:15:27 -07:00
Kenny Root
28b1f0ee02 Don't use X509CertImpl directly
Change-Id: Ibabee35c90c2636c6f362e4d778d6795a0cef6c2
2013-04-29 13:27:39 -07:00
jwilson
dea64ad715 Adjust the HttpResponseCache for OkHttp.
Change-Id: I2a80f3c3f30a3d15673d797fa3d1211286f75030
2013-04-03 20:15:36 +00: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
Peter YOON
0c0f95321f EthernetDataTracker: Set network available on connected
This change fixes state mismatch found in the bugs below,
and makes the code look consistent with disconnect().

In startMonitoring(), reconnect() is called before mNMService.registerObserver().
Then dhcpThread.run() could finish without getting interfaceLinkStateChanged() callback.
In such a case, mNetworkInfo has connected but not-available state - which is contradictory.

Bug: 8113933, 8291000, 8291039
Change-Id: I29d74f8d09dcffb97d6c9f8198811bca046fef0c
2013-03-11 14:53:37 +09:00
Kenny Root
df1498dcba am bf043b50: Merge "Add TLS Channel ID support to SSLCertificateSocketFactory."
# By Alex Klyubin
# Via Alex Klyubin (1) and Gerrit Code Review (1)
* commit 'bf043b505c945403752227d89b74bacd7fbcd608':
  Add TLS Channel ID support to SSLCertificateSocketFactory.
2013-01-25 14:25:36 -08:00
Alex Klyubin
4ef6c9b6a1 Add TLS Channel ID support to SSLCertificateSocketFactory.
This adds a new method setChannelIdPrivateKey as a hidden API.

See http://tools.ietf.org/html/draft-balfanz-tls-channelid-00 for
more information about the TLS Channel ID extension.

Change-Id: I73c1905afdce01d4831de7faa55ea4496575b5a5
2013-01-18 12:50:39 -08:00
Brian Carlstrom
bc7d5a55b2 am 537fb0af: Merge "Use most specific attributes for distinguished name display"
* commit '537fb0afe24a520e7b9a2442786b6fb4fe194392':
  Use most specific attributes for distinguished name display
2013-01-04 15:47:39 -08:00
Brian Carlstrom
91154ce658 Use most specific attributes for distinguished name display
Bug: 7894348
Bug: http://code.google.com/p/android/issues/detail?id=41662
Change-Id: I8048a53b8a9a17b384f12b6a4f40071bb3dd3e04
2013-01-04 15:27:24 -08:00
Adam Hampson
fd0b25875c am 6a9d5761: EthernetDataTracker: Start DHCP on Link Up
* commit '6a9d57617a9b502c65d62f053ad8bd0309afdc24':
  EthernetDataTracker: Start DHCP on Link Up
2012-12-06 18:58:10 -08:00
Adam Hampson
6a9d57617a EthernetDataTracker: Start DHCP on Link Up
The behavior of mLinkUp has previously changed so that it only
represents the link state.  This changes fixes
interfaceLinkStateChanged() so that it triggers a reconnect based
only on the present link state.

Change-Id: I950e04e1f5b5019d59d3b9530f369f8b8f13134a
Signed-off-by: Adam Hampson <ahampson@google.com>
2012-12-05 10:29:23 -08:00
Elliott Hughes
878da65328 am 9ed4abd8: Merge "Fix AndroidHttpClient documentation error."
* commit '9ed4abd875852524c5dd366f30b5b7bda93f0da3':
  Fix AndroidHttpClient documentation error.
2012-11-29 10:21:23 -08:00
Elliott Hughes
d2dcd7ada3 Fix AndroidHttpClient documentation error.
AndroidHttpClient doesn't let the user add HttpRequestInterceptor classes.

Bug: http://code.google.com/p/android/issues/detail?id=37294
Change-Id: I66f6581fa321dc16ddfe35c8f4242bc31f79bdfa
2012-11-29 08:32:13 -08:00
Jeff Sharkey
9634e97067 am bfea4f04: am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev
* commit 'bfea4f04f226f1adf374412628d5945c380382a7':
  Useful annotations for code documentation.
2012-11-15 11:56:19 -08:00
Jeff Sharkey
8b2c3a1460 Useful annotations for code documentation.
Bug: 6537978
Change-Id: I806c3c09e3255f8789455f13bf37c1dde2a93f1f
2012-11-12 12:42:17 -08:00
Irfan Sheriff
37794c200f am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
* commit 'f264e8e34e32bfb8e7e75b61b9da9b6f219690b0':
  Stop supplicant and dhcp before start
2012-11-08 06:14:33 -08:00
Kenny Root
58ed5d748c am 768d9e1a: Merge "Correct executable bit for source files"
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
  Correct executable bit for source files
2012-11-07 11:52:12 -08:00
Kenny Root
3a084af2e9 Correct executable bit for source files
Many media files and source code files were marked as executable in Git.
Remove those.

Also a shell script and python script were not marked as executable.

Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
2012-11-07 10:27:31 -08:00
Irfan Sheriff
511d5346ce Stop supplicant and dhcp before start
Bug: 7227463
Change-Id: Iaa0df7522edc38d25fae2bbda8d24490e997e733
2012-11-06 15:53:32 -08:00
Jeff Sharkey
b0a579f833 Sanity check network stats coming from disk.
Throw early when structure is unstable, which allows the normal
recoverFromWtf() path to recover automatically.

Bug: 7440485
Change-Id: Ic150d17daac4de7c9ff3489025403a9b485b4620
2012-11-02 15:38:15 -07:00
Irfan Sheriff
ebb8f413e6 Add icon for mobile notification
Bug: 7087564
Change-Id: If856bdfa28c024fb775fd3f8231bd5a16fef59e6
2012-10-02 16:50:29 -07:00
Irfan Sheriff
b8aad91f05 Add operator name to network notification
Bug: 7087564
Change-Id: Ibe7a09fc6858dfea5f65092777bbd6ca82177043
2012-10-02 14:01:28 -07:00
Jeff Sharkey
625239a054 Migrate more Secure settings to Global.
Migrate networking, storage, battery, DropBox, and PackageManager
related Secure settings to Global table.

Bug: 7232014, 7231331, 7231198
Change-Id: I772c2a9586a2f708c9db95622477f235064b8f4d
2012-09-27 16:22:53 -07:00
Brian Carlstrom
13987fb432 Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev 2012-09-26 16:05:00 -07:00
Brian Carlstrom
992f238d13 Reverting public setSoWriteTimeout
This reverts fd901f735c and 5e21bf934b

Bug: 7237764
Bug: 6693087
Change-Id: I7cc9657e4df219481eb33de803081a01b13ee0f2
2012-09-26 15:48:21 -07:00
Jeff Sharkey
1951db86f5 Merge "Multi-user ringtone playback." into jb-mr1-dev 2012-09-26 13:38:22 -07:00
Jeff Sharkey
65c4a2b26c Multi-user ringtone playback.
Change RingtonePlayer to open content:// Uris based on requesting
UserHandle.  Grant SystemUI visibility to all emulated storage so
it can play ringtones for apps without READ_EXTERNAL_STORAGE.

Resolve canonical file:// Uris before passing out of source app,
replacing any /emulated_legacy/-style paths with user-specific
variant so they can be opened by SystemUI.  Calling for RemoteViews,
Ringtones, and Notifications.

Bug: 7202982
Change-Id: Ibf0eca8df80c1486711144a7b648f464aadfe099
2012-09-26 10:49:35 -07:00
Alon Albert
fd901f735c Add a static generator that takes a Socket Write Timeout Argumanet
Use it from AndroidHttpClient

Bug: 6693087
Change-Id: I08648e441a6431d0944caaec0db516a26671f2a5
2012-09-25 15:33:28 -07:00
Brian Carlstrom
5e21bf934b Unhide SSLCertificateSocketFactory.setSoWriteTimeout
Bug: 6693087
Change-Id: I585c2a61226da58077fd7cd7826695ce17380248
2012-09-25 10:38:52 -07:00
Brian Carlstrom
7ab7a8b582 Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified
Bug: 6693087
Change-Id: Id7b07f033b5ff9f01da33d535e01aa909aace8a1
2012-09-21 16:33:50 -07:00
Irfan Sheriff
9538bdd3c7 Captive check for both mobile and wifi
Bug: 7113195
Bug: 7102238
Bug: 7087564

Change-Id: Iac08db9de3935338ad498aa3983d2ca82057dda1
2012-09-20 12:13:06 -07:00
Jeff Sharkey
daa57e8d18 Migrate network stats from removed users.
When a user is removed, migrate all network stats belonging to that
user into special UID_REMOVED bucket.  Also removes those stats from
kernel to avoid double-counting if another user is created.

Bug: 7194784
Change-Id: I03f1d660fe3754566326b7749cae8068fc224ea9
2012-09-19 14:54:05 -07:00
Narayan Kamath
5d1a870a25 Merge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev 2012-09-19 01:31:36 -07:00
Irfan Sheriff
5d4206a55c Merge "Get strings in" into jb-mr1-dev 2012-09-18 22:34:34 -07:00
Irfan Sheriff
7f0aaac7f2 Get strings in
Bug: 65904101
Bug: 7087564
Change-Id: Ic4887a737a640010e12efd2a16b24af2215ba72a
2012-09-18 22:06:13 -07:00
Andy Stadler
8071124375 Move X509TrustManagerExtensions to correct directory
Also removed unused imports.

Original Change-Id: If117ffd2240a7bf3437115f3cf2f766c4e249600

Change-Id: I66886ee9792c23a1e421022fd1f675fdf35ea049
2012-09-18 17:40:14 -07:00
Geremy Condra
cb4c581975 Fix bad isinstance check in X509TrustManagerExtensions and add test.
Change-Id: I333957186655b2543a637dafa8c51b0bba9d4dfb
2012-09-18 13:43:32 -07:00
Geremy Condra
ed41a4e2d8 Initial commit for X509TrustManagerExtensions.
This provides a mechanism for exposing the bells
and whistles we've attached to trust managers to
third parties.

Change-Id: If117ffd2240a7bf3437115f3cf2f766c4e249600
2012-09-18 11:29:46 -07:00
Narayan Kamath
b4db962da0 Add APIs to enable SNI and session tickets on sockets.
Change-Id: I34c546b22d31476a670c0e8f5724185e838903b0
2012-09-18 10:56:24 +01:00
Jeff Sharkey
d0c6ccbafd Move NetworkPolicy from apps to UID.
For multi-user devices, switch to storing policy per-user instead of
per-app.  Also watch for user added/removed broadcasts to clean up
policies and apply global restrictions.

Bug: 7121279
Change-Id: Ia7326bd0ebe0586fa4ec6d3a62f6313dc8814007
2012-09-14 23:00:27 -07:00
Geremy Condra
f743e54f2d Change verifyServerDomainAndCertificates to pass in a hostname.
This is required for cert pinning.

Change-Id: I16041f17e97d9ae592a2b809f6a8164268338d1b
2012-09-14 16:43:52 -07:00
Robert Greenwalt
f008ab727e am 5d33e76c: am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
* commit '5d33e76cff65245d03f592a3dbcbf2e17a2f1581':
  EthernetDataTracker: indicate link up based on flags
2012-09-11 15:09:11 -07:00
Robert Greenwalt
65208857d3 am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
* commit '2415841c370d855d7f3a3e6a537e641c69a57097':
  EthernetDataTracker: indicate link up based on flags
2012-09-11 15:04:50 -07:00
Vishal Mahaveer
b6b72f5411 EthernetDataTracker: indicate link up based on flags
Indicate link up state based on flags/interface up, and not on IP address.
This is for ethernet interfaces that already exists.

Change-Id: Ib342d519c483bbb2dfa08cfac2c0c1a288cee7c0
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
2012-09-11 16:41:16 -05:00
Irfan Sheriff
a28c18fc61 Merge "Fix DHCP handling at disconnect/reconnect" into jb-mr1-dev 2012-08-29 15:55:43 -07:00
Irfan Sheriff
6bfc88876a Fix DHCP handling at disconnect/reconnect
Wifi can have a quick disconnection followed by a reconnection. We used to
create a new DHCP state machine thread for every new connection and
never really waited until it quit after disconnect. This may have lead to
situations where repeated disconnect/reconnects resulted in multiple dhcp
start calls.

We now keep the statemachine after a disconnect and only shut it at supplicant
stop.

Bug: 6417686
Change-Id: Icf66efdc654be886e3eb46c81f09f8cce536f2f6
2012-08-29 15:35:57 -07:00
Jean-Baptiste Queru
69626dab17 am 4a4edbbf: am 7fecf5f4: Merge "Make addAddress locale safe"
* commit '4a4edbbfce2e1a8b34b5b9ff2793eace303dae5a':
  Make addAddress locale safe
2012-08-29 13:03:41 -07:00
Jean-Baptiste Queru
4a4edbbfce am 7fecf5f4: Merge "Make addAddress locale safe"
* commit '7fecf5f4513a94adb71ba29b9918565b4b5e5e7b':
  Make addAddress locale safe
2012-08-29 12:59:06 -07:00