Commit Graph

113 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
d85639afb6 Merge "Public Download Manager API" 2010-02-12 13:48:51 -08:00
Dan Egnor
60586f2ec6 API CHANGE: Add SSLSessionCache public API to allow unbundled SSL session caching.
Generally clean up the associated SSLCertificateSocketFactory API as well,
change AndroidHttpClient to use this new thing, and make the android-common
library build SDK-clean (woo hoo).

Bug: 2362543
Bug: 2357311
2010-02-10 14:43:21 -08:00
Jean-Baptiste Queru
47f46981cc Public Download Manager API
Change-Id: Ie91e816620b367816572f83d85cfecc91d66c764
2010-02-08 15:24:27 -08:00
Ken Shirriff
5c19aeca3d API review: TrafficStats: rename Pkts to Packets
Rename getMobileTxPackets(), getMobileRxPackets(), getTotalTxPackets(),
getMobileRxPackets()

bug 2420318
2010-02-04 14:37:21 -08:00
Robert Greenwalt
d0e18ffb82 First pass at USB Tethering.
bug:2281900
2010-02-04 09:15:06 -08:00
Huahui Wu
c4e834dc47 Rebuild a cleaner certificates chain before validating it.
This change cleans the server certificates:
1. Use the end-entity certificate as found in the chain received from the server as the end-entity cert for the newly built chain.

2. Look at the last cert in the newly built chain, specifically it's "issuer" field.  If there's a cert in the chain as received with this as the "subject", and this cert hasn't yet been moved into the newly built chain, move it there (as the new last cert).  Repeat this step 2 until you can't continue (because there's no matching previously unused cert left).

3. If the last certificate in the new chain has expired (and it's not the end-entity cert), remember this fact, and remove it (so that we can try if we can validating the chain for a different root). If in this case it turns out that we still can't validate the chain, it's probably the cert expiry error that should be displayed.

This CL also cleans the redundant error detection code and reduces the error messages to two types, which are the only two make differences to the user:
a. SSL_IDMISMATCH for name mismatch,
b. SSL_UNTRUSTED for other reasons.
2010-02-02 17:47:47 -05:00
Brian Carlstrom
6505122dfe Issue 1597: browser crash possibly related to invalid SSL certificate 2010-01-28 11:17:43 -08:00
San Mehat
4d02d001ef NetworkManagementService: Introduce INetworkManagementEventObserver
Introduce a callback event observer which can be registered on the
INetworkManagementService instance to receive events from the service.

Signed-off-by: San Mehat <san@google.com>
2010-01-22 16:10:29 -08:00
San Mehat
353ced79b4 android.net: Introduce @hidden parcelable InterfaceConfiguration class
This class is used to get/set interface configuration via the
new NetworkManagementService API

Signed-off-by: San Mehat <san@google.com>
2010-01-22 12:22:54 -08:00
Robert Greenwalt
1bc3c3775b Fix Javadoc errors so the sdk can build.
I unhid some API in a previous install, triggering javadoc processing on
their buggy comments.

Fixing build.
2010-01-13 11:47:50 -08:00
Robert Greenwalt
c849cdf5cf Unhide some CM constants to support unbundling.
The MOBILE_MMS, MOBILE_SUPL, MOBILE_DUN and MOBILE_HIPRI net types used
by location, messaging, and vending needed to be exposed.

Bug: 2363272
Change-ID: I6d2361d3642064db619b283b9217512563eb3439
2010-01-13 10:01:44 -08:00
Makoto Onuki
8f028a94fc Moved DomainNameChecker to android common.
- Moved DomainNameChecker from android.net.http to android common, and renamed to DomainNameValidator.
- Added a simplified version of DNParser, which DomainNameValidator uses instead of X509Name in order to extract Subject Name from a certificate.
- Added unit tests for DomainNameChecker and DNParser.

There's a suspicious comment in DomainNameChecker saying something like "X509Certificate fails to parse a certificate when a subject alt name begins with '*'".  I think we should fix it if it's really the case -- otherwise certificates with the wildcard wouldn't work.  I'll see if it's true after submitting this patch.
2010-01-12 10:27:13 -08:00
Grace Kloba
5aded76004 am 552346a7: am 106f9b24: Patch from Huahui Wu.
Merge commit '552346a743be7c8b10893f817238e92938866999'

* commit '552346a743be7c8b10893f817238e92938866999':
  Patch from Huahui Wu.
2010-01-05 11:32:52 -08:00
Grace Kloba
552346a743 am 106f9b24: Patch from Huahui Wu.
Merge commit '106f9b244633171ab75dd98b9761b7137c1a4705' into eclair-mr2-plus-aosp

* commit '106f9b244633171ab75dd98b9761b7137c1a4705':
  Patch from Huahui Wu.
2010-01-05 11:20:18 -08:00
Grace Kloba
106f9b2446 Patch from Huahui Wu.
Fix http://b/issue?id=1908085
2010-01-05 10:50:39 -08:00
Tom Taylor
f0108cda21 resolved conflicts for merge of ad2fa35d to master
Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90
2009-12-22 10:11:55 -08:00
Tom Taylor
ad2fa35d88 am d4a4729c: Update imports to android-common
Merge commit 'd4a4729c0cac582a2dcec7c8cfb316b81885a0f0' into eclair-mr2-plus-aosp

* commit 'd4a4729c0cac582a2dcec7c8cfb316b81885a0f0':
  Update imports to android-common
2009-12-21 15:44:34 -08:00
Tom Taylor
d4a4729c0c Update imports to android-common
Several files were moved to android-common. Update all the references
to import those files from the new location.
2009-12-21 13:59:18 -08:00
Paul Westbrook
e143bc92b2 resolved conflicts for merge of 15d3bb2c to master 2009-12-14 10:56:45 -08:00
Paul Westbrook
15d3bb2ce6 am 7762d936: Unbundling work
Merge commit '7762d93621f508f4410fd37b5bbdfec0071b0420' into eclair-mr2-plus-aosp

* commit '7762d93621f508f4410fd37b5bbdfec0071b0420':
  Unbundling work
2009-12-14 10:10:20 -08:00
Paul Westbrook
7762d93621 Unbundling work
Moved AndroidHttpClient, Rfc822InputFilter, Rfc822Validator
NumberPicker, NumberPickerButton to android-common
---
2009-12-14 09:24:09 -08:00
Ken Shirriff
8ea486788f am 0e933c85: am f7d0b013: Add TrafficStats class to SDK.
Merge commit '0e933c853ad53037631e5bca5b4a46f056c1e538'

* commit '0e933c853ad53037631e5bca5b4a46f056c1e538':
  Add TrafficStats class to SDK.
2009-12-10 07:04:31 -08:00
Ken Shirriff
0e933c853a am f7d0b013: Add TrafficStats class to SDK.
Merge commit 'f7d0b01387c10f93bf17981d45087810c80f0902' into eclair-mr2-plus-aosp

* commit 'f7d0b01387c10f93bf17981d45087810c80f0902':
  Add TrafficStats class to SDK.
2009-12-09 15:48:11 -08:00
Ken Shirriff
f7d0b01387 Add TrafficStats class to SDK.
This class (a rename of NetStat) provides network byte and packet statistics.
NetStat will be removed separately, to avoid breaking other packages when submitting.
2009-12-08 10:50:25 -08:00
Grace Kloba
6180977d11 am 8657978a: am ddcea3d2: Expose onReceivedSslError() so that the WebView client can accept the error and continue.
Merge commit '8657978aabc7141869926a98a0da257255678dd4'

* commit '8657978aabc7141869926a98a0da257255678dd4':
  Expose onReceivedSslError() so that the WebView client
2009-12-07 18:37:00 -08:00
Grace Kloba
8657978aab am ddcea3d2: Expose onReceivedSslError() so that the WebView client can accept the error and continue.
Merge commit 'ddcea3d21645bb3037703c84807dae077aae62ce' into eclair-mr2-plus-aosp

* commit 'ddcea3d21645bb3037703c84807dae077aae62ce':
  Expose onReceivedSslError() so that the WebView client
2009-12-07 13:40:53 -08:00
Grace Kloba
ddcea3d216 Expose onReceivedSslError() so that the WebView client
can accept the error and continue.

Fix http://b/issue?id=2299152
2009-12-07 13:20:33 -08:00
Robert Greenwalt
5154ae7665 Cleanup ConnectivityServices network configuration
Don't instantiate objects not needed for the device.

bug: 2226064
2009-11-30 12:56:02 -08:00
Brad Fitzpatrick
70ece8d334 Speed up Uri.getQueryParameter by allocating less.
Sample hierarchial URL, from my ContactsProvider test case:

content://com.android.contacts/data?account_name=braddroid%40gmail.com&account_type=com.google.GAIA&caller_is_syncadapter=true

Without this patch:  (fetching the "account_name" parameter)

10000 iters: 0.5293 ms average
10000 iters: 0.5119 ms average
10000 iters: 0.5158 ms average

With this patch, rewriting it to not allocate memory (no implicit
StringBuilder), but still no caching:

1) when it needs to decode something (i.e account_name above;
   allocates memory)

  50000 iters: 0.28724 ms average
  50000 iters: 0.31774 ms average
  50000 iters: 0.28764 ms average

2) when it doesn't need to decode (and thus allocate memory,
   i.e. account_type above)

  50000 iters: 0.0954 ms average
  50000 iters: 0.09124 ms average
  50000 iters: 0.09088 ms average
2009-10-26 14:46:25 -07:00
Eric Fischer
94f3a36326 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-08 17:52:53 -07:00
Mike Lockwood
d5b090b26b am 348b92bd: Merge change Iee227ace into eclair
Merge commit '348b92bd513087369ac682e29620d7829fa1381b' into eclair-mr2

* commit '348b92bd513087369ac682e29620d7829fa1381b':
  GPS: Fix problem with SUPL when SUPL APN is already active.
2009-10-08 17:32:31 -07:00
Mike Lockwood
a4f6c96f1a am 348b92bd: Merge change Iee227ace into eclair
Merge commit '348b92bd513087369ac682e29620d7829fa1381b' into eclair-plus-aosp

* commit '348b92bd513087369ac682e29620d7829fa1381b':
  GPS: Fix problem with SUPL when SUPL APN is already active.
2009-10-08 15:10:25 -07:00
Mike Lockwood
03d246779e GPS: Fix problem with SUPL when SUPL APN is already active.
Use ConnectivityManager.CONNECTIVITY_ACTION broadcast in LocationManagerService
to notify GPS when SUPL connection is ready instead of TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED,
which is not sent in all cases.
Expand LocationProvider.updateNetworkState() to include NetworkInfo object.

Fixes bug b/2155661

Change-Id: Iee227ace7d536b36cf7973e3e6a8b7a621ce6565
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-08 17:24:21 -04:00
Robert Greenwalt
c0565fb88c am 92b5caa4: Merge change Id8df149c into eclair
Merge commit '92b5caa4e21d48db6efeddba532d1546c6e686b1' into eclair-plus-aosp

* commit '92b5caa4e21d48db6efeddba532d1546c6e686b1':
  Turn some logging back on in ConnectionManager
2009-10-07 11:57:26 -07:00
Dianne Hackborn
031e4ac7dd am 48e6725c: Merge change Iaca22686 into eclair
Merge commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f' into eclair-plus-aosp

* commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f':
  Work on issue #2163789: Way too much logging
2009-10-07 11:44:12 -07:00
Robert Greenwalt
2a9b411d4e am e8830120: am 92b5caa4: Merge change Id8df149c into eclair
Merge commit 'e8830120c8e416a26520dfbbd0e386e77255dbda' into eclair-mr2-plus-aosp

* commit 'e8830120c8e416a26520dfbbd0e386e77255dbda':
  Turn some logging back on in ConnectionManager
2009-10-06 15:52:53 -07:00
Robert Greenwalt
e8830120c8 am 92b5caa4: Merge change Id8df149c into eclair
Merge commit '92b5caa4e21d48db6efeddba532d1546c6e686b1' into eclair-mr2

* commit '92b5caa4e21d48db6efeddba532d1546c6e686b1':
  Turn some logging back on in ConnectionManager
2009-10-06 15:40:27 -07:00
Robert Greenwalt
d8df149cfb Turn some logging back on in ConnectionManager
Trimmed a bunch of logging out, but turned it on so we get the critical stuff.

bug: 2168291
2009-10-06 14:12:53 -07:00
Patrick Scott
8e20e88ba6 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-05 10:13:51 -07:00
Dianne Hackborn
492eb109ff am 48e6725c: Merge change Iaca22686 into eclair
Merge commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f' into eclair-mr2

* commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f':
  Work on issue #2163789: Way too much logging
2009-10-04 15:41:35 -07:00
Dianne Hackborn
bd0a81ff1c Work on issue #2163789: Way too much logging
Dr.No from mcleron.

Change-Id: Iaca2268684f83fe8757e64db0b0e047a19755311
2009-10-04 14:48:47 -07:00
Patrick Scott
86806ce11a Process synchronous requests in the same RequestQueue.
Use a dedicated Connection to process a synchronous request using the main
RequestQueue and on the WebCore thread.

HttpConnection, HttpsConnection, Connection:
    No need for ConnectionManager, just pass the proxy host to
    HttpsConnection. In Connection.clearPipe, empty should be set to true if the
    RequestFeeder does _not_ have a request for the host. I don't think that
    broke anything but it is incorrect.
ConnectionThread:
    Refactor the proxy selection into ConnectionManager.getConnection
RequestHandle:
    Add a new constructor that takes a Connection argument. Add processRequest
    to process a single request on that Connection.
RequestQueue:
    Add determine host to select between the request's host and the proxy. Add
    queueSynchronousRequest to make a new request that operates on a private
    connection. Add SyncFeeder to handle RequestFeeder.requeueRequest if the
    request fails.
Network: Use the new RequestQueue api to handle a synchronous request.

Bug: 1315832
2009-10-02 14:51:55 -04:00
Robert Greenwalt
1412308467 am a1323c77: Merge change Iaf08eabc into eclair
Merge commit 'a1323c77b961ae1b9cfaf5305e05780b07e88226' into eclair-plus-aosp

* commit 'a1323c77b961ae1b9cfaf5305e05780b07e88226':
  Reduce the ConnectivityManager logging.
2009-09-30 22:18:54 -07:00
Robert Greenwalt
1ef95f9eed Reduce the ConnectivityManager logging.
Same great info, just fewer chars.
2009-09-30 22:10:41 -07:00
Robert Greenwalt
fc6cd59650 am a16ca5ec: Merge change 27141 into eclair
Merge commit 'a16ca5ec4ba936ed2731a74650b6882d0ffde404' into eclair-plus-aosp

* commit 'a16ca5ec4ba936ed2731a74650b6882d0ffde404':
  Fix ConnectivityManager's handling of apn switch.
2009-09-25 17:57:27 -07:00
Robert Greenwalt
d1aca6aa73 Fix ConnectivityManager's handling of apn switch.
It was clearing the interfacename when it was needed later in the process - the prevented us
from clearing the route to private dns servers and clearing the flag that this was set.
Consequently future uses would not set the private dns servers (since it thought they were already
set) and our lookups would fail.

bug: 2146929
2009-09-25 16:43:20 -07:00
Lorenzo Colitti
4d5cd95542 am 7c5c6076: Merge change 26640 into eclair
Merge commit '7c5c6076ea5d02aabbb449b1341ec44d184d1316' into eclair-plus-aosp

* commit '7c5c6076ea5d02aabbb449b1341ec44d184d1316':
  Support IPv6 literal URLs, e.g., http://[2001:4860:b004::68]/ as per RFC 3896
2009-09-23 22:09:41 -07:00
Lorenzo Colitti
78cf04f658 Support IPv6 literal URLs, e.g., http://[2001:4860:b004::68]/ as per RFC 3896
section 3.2.2.

Change-Id: I6166753fac2c141440fc3c860ab644b29b188d76
2009-09-23 18:05:51 -07:00
Patrick Scott
65540522d7 am 3239de8c: Merge change 25338 into eclair
Merge commit '3239de8cd78b3fa292d85ee7658a9871cdfbc79b' into eclair-plus-aosp

* commit '3239de8cd78b3fa292d85ee7658a9871cdfbc79b':
  Remove the network connection logic from RequestQueue.
2009-09-17 12:31:14 -07:00
Patrick Scott
aaebc86386 Remove the network connection logic from RequestQueue.
This doesn't always work right and is causing some problems if the network comes
back up without sending the broadcast.
2009-09-17 15:10:30 -04:00