Commit Graph

77 Commits

Author SHA1 Message Date
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
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
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
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
Grace Kloba
a16de7b03a Fix 1993520 where page cycler fails.
Recover the old logic before removing network management. Remove the empty
list for the host after consuming the last entry. As we should never have
an empty list, it is safe to call removeFirst without checking whether it is
empty.

Currently, in getRequest() or removeFrist(), if we found an empty list, we
remove it. Then we return null for the request even there are requests in
another list. So the page stops loading until the next getRequest() or
removeFirst() is called. If they are not called, those requests will never
be accessed.
2009-07-24 16:27:11 -07:00
Jean-Baptiste Queru
cf4550c319 donut snapshot 2009-07-21 11:16:54 -07:00
Patrick Scott
c319c69b12 Allow 205 and 305 to have content.
205 is interpreted by Safari to be like 200 and show the given content. Change
canHaveResponseBody to allow 205 to have a body.

305 is a very rare server response indicating to the client to use the given
Location header as a proxy and reissue the original request. Curl doesn't do
anything with this header and neither does internal networking code. For now,
we will just allow the response body to propagate to webcore.
2009-07-21 07:55:50 -04:00
Patrick Scott
4a06b68c82 Correctly set the thread priority for ConnectionThreads.
This does not change the actual thread priority but if the default priority
changes, this will have the desired result of being slightly less favorable.

I tried messing with the priorities to see if a higher or lower priority helped
but it seemed to do more harm than good. It might be worth more investigation to
find out where all the thread time is being spent so we can determine the
correct priority.
2009-07-20 08:55:06 -04:00
Patrick Scott
fe4fec7c66 Remove all our old high priority knowledge since WebCore will manage it.
Also removed an unused variable in RequestQueue.java.
2009-07-15 15:48:02 -04:00
Android (Google) Code Review
38a34b2c75 am 2d791055: Merge change 6820 into donut
Merge commit '2d7910555ab6b376e8cd1646db6c329c1cd1adb7'

* commit '2d7910555ab6b376e8cd1646db6c329c1cd1adb7':
  Fixed NPE bugs in Uri. Fixes internal issue #1724719.
2009-07-12 06:06:31 -07:00
Android (Google) Code Review
9cf012a9fc Merge change 6823
* changes:
  wifi: Keep the WLAN network interface up whenever wifi is enabled.
2009-07-10 16:29:20 -07:00
Bob Lee
5621f0d928 Fixed NPE bugs in Uri. Fixes internal issue #1724719.
Modified getQueryParameter() to use the encoded query string. Fixes internal issue #1749094.
2009-07-10 14:54:08 -07:00
Mike Lockwood
0900f36576 wifi: Keep the WLAN network interface up whenever wifi is enabled.
We now only bring it down briefly and bring it back up again when
we want to reset the interface.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-10 17:24:07 -04:00
Bob Lee
c8e852da32 resolved conflicts for merge of ad94a983 to master 2009-07-10 14:13:37 -07:00
Bob Lee
b8b8f044f4 Uri.EMPTY.toString() was returning null due to an initialization order bug. Fixes internal issue #1957015. 2009-07-10 13:34:37 -07:00
Simon Schoar
f76035f352 Fixed typo, RFC3296 is for LDAP, RFC2396 is for URI 2009-07-07 12:43:38 -07:00
Grace Kloba
340a1b21de Fix the performance collection in the http thread. A connection can be reused. Change the thread time collection based on per request. 2009-07-02 15:30:34 -07:00
Android (Google) Code Review
e10809d02c am 7a573862: Merge change 5720 into donut
Merge commit '7a5738624fa78e328b5f36c687c20b9cf0eb5a60'

* commit '7a5738624fa78e328b5f36c687c20b9cf0eb5a60':
  Fix #1876303. Even rfc2616 4.2 says that "Field names are case-insensitive.", servers including Google internal uses case-sensitive checking for "Cookie". So change it.
2009-07-01 11:19:50 -07:00
Mike Lockwood
cd15475bc3 Revert "ConnectivityManager: Add support for bringing up the default APN."
This reverts commit a84b6faffb.

I will work on a better mechanism for bringing up the default APN
when Wifi is enabled.
2009-06-30 14:02:27 -04:00