Commit Graph

92 Commits

Author SHA1 Message Date
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
Jean-Baptiste Queru
e525eef4b8 merge from open-source master 2009-09-16 16:22:13 -07:00
Kenny Root
fc01794f33 Make Uri.parseUserPart, parseHost, and parsePort symmetric
Currently parseUserPart uses the encoded authority to split the URI
into user and non-user parts, but the parseHost and parsePort uses
the decoded URI to split the URI into non-host, host, and port parts.
This gives unexpected results when %40 ('@') and %3a (':') is used
in a URI:

Uri test = Uri.parse("http://bob%40lee%3ajr@example.com:42/");
test.getUserInfo() => "bob@lee:jr"
test.getHost() => "lee:jr@example.com" (should be "example.com")
test.getPort() => -1 (should be 42)
2009-09-14 17:45:04 -07:00
Robert Greenwalt
8206ff30c2 Fix for multi-apn MMS access.
Mark cellular variants with the same availability, regardless of which are currently in use.
Availability just means the radio is enabled and sees the network, but has no guarantees that
we could connect to an APN if requested.

Fix the requestRouteToHost logic to support apn switches without WIFI.

bug:2093841
2009-09-10 18:01:01 -07:00
Jean-Baptiste Queru
be8e36e32b merge from donut 2009-09-03 15:19:21 -07:00
Jean-Baptiste Queru
72b1f379d5 donut snapshot 2009-08-31 09:17:57 -07:00
Robert Greenwalt
0badd0b700 Note net availability even when apn not enabled
Fixes a problem where mms apn was on when we lost the network (airplane mode) but mms was
off when airplane mode was turned off so it kept thinking we didn't have access and
future mms always failed.

bug: 2075145
2009-08-24 17:41:49 -07:00
Robert Greenwalt
ec9fe4672a Fix a race condition for data change notification
We could sometimes not be told about network state changes breaking subsequent mms access.
Turning on more logging too.

bug: 2069106
2009-08-24 16:19:42 -07:00
Li Zhe
ebe66345e7 Framework changes to support HSDPA/HSUPA/HSPA
HSDPA: High-Speed Downlink Packet Access
HSUPA: High-Speend Uplink Packet Access
HSPA:  High-Speed Packet Access

Add support for HSDPA/HSUPA/HSPA:
 1) extend TelephonyManager.NETWORK_TYPE for HSDPA/HSUPA/HSPA
 2) extend ServiceState.RADIO_TECHNOLOGY for HSDPA/HSUPA/HSPA
 3) set radioTechnology into ServiceState in GsmServiceStateTracker
 4) change the implementation of TelephonyManager.getNetworkType to
    solve the competition timing issue between the time of setting
    system property and the time of receiving notification through
    PhoneStateListener
    4.1) add a getNetworkType interface in ITelephony.aidl
 5) add icons resources for HSDPA/HSUPA/HSPA
 6) make use of HSDPA/HSUPA/HSPA icons in StatusBarPolicy
2009-08-21 13:41:05 -07:00
Bob Lee
5dc0c00258 am e97c2006: Updated Browser and MCS to use shared default trust manager instead of initializing their own copies.
Merge commit 'e97c2006bf7c391c933307e520a392e532aa5d6a' into eclair

* commit 'e97c2006bf7c391c933307e520a392e532aa5d6a':
  Updated Browser and MCS to use shared default trust manager instead of initializing their own copies.
2009-08-20 19:31:59 -07:00
Bob Lee
e97c2006bf Updated Browser and MCS to use shared default trust manager instead of initializing their own copies. 2009-08-20 18:48:31 -07:00
Robert Greenwalt
a64bf834ff Fix various issues found when testing Mms.
Fix some race conditions (check isTeardownRequested).
Fix the passing of mInterfaceName to subtypes (mms, etc).
Fix the generation of CONNECTED message to already active subtypes.
Fix the enabling of Data in DataConnectionTracker.

bug: 2065037
2009-08-19 21:58:12 -07:00
Robert Greenwalt
60a45aff31 Fix Wifi+Cell on boot after wifi in use.
The gist of it is: Ignore reconnect fail of default APN during boot.

A long path:
1 If wifi is started at boot it starts fast - before the PhoneService is available.
2 Wifi starts by failing - you get DISCONNECTED/Scanning events so CM starts the other default network (mobile).
3 Trying to restart mobile fails because the phone service isn't up yet.
4 The failure is noted and the net is marked as not-enabled.
5 The phone trys to auto-start the mobile network and succeeds, sending state-changed events
6 The CM ignores the state-changed events because the net isn't enabled (see 4).

The long term fix is to remove two-way state tracking from the MobileDataStateTracker and instead just consume the state fed to us in state-change events.
Near term fix is to not mark the default net disabled when we have failure (step 4) if the phone service isn't available.
2009-08-19 16:34:41 -07:00
Robert Greenwalt
c85675d0ef Fix for Mms without wifi.
Need to change MOBILE_MMS network into connnected state if the current
apn can already support the traffic.

Bug:2058212
Bug:2055065
Bug:2046882
2009-08-18 17:39:13 -07:00
Robert Greenwalt
25a5d3db3f Fix CDMA to startup/shutdown based on apn en/disab
Fixes MMS during wifi.
Also fixes CDMA for ConnectivityManager change.
2009-08-17 15:20:14 -07:00
Robert Greenwalt
42acef3733 Add net type to mobile for mobile-required traffic
This also refactors ConnectivityService a bit towards supporting multiple simultaneous connections by making each a seem like a seperate Network with it's own stateTracker, etc.
Also adds tracking of process death to clean orphaned startUsingNetworkFeature features.
2009-08-12 16:08:25 -07:00
Jean-Baptiste Queru
ac1e59d887 donut snapshot 2009-08-11 13:12:34 -07:00
Grace Kloba
f6d1a5528e resolved conflicts for merge of b8802b21 to master 2009-08-03 10:49:58 -07:00
Grace Kloba
4c8db8a4fe Fix #2025900. If a https request is canceled while openConnection is called
and a ssl error happened, the http thread can be blocked for up to 10 min.
Added code to detect this case and unlock the thread.
2009-07-30 23:13:34 -07:00
Jean-Baptiste Queru
61e4248f8f merge from donut 2009-07-29 14:57:05 -07:00
Jean-Baptiste Queru
a8675f67e3 donut snapshot 2009-07-29 14:25:07 -07:00
Jean-Baptiste Queru
2af1b3db3d Merge korg/donut into korg/master 2009-07-25 21:15:25 -07:00