3283 Commits

Author SHA1 Message Date
Mike Lockwood
6cec0dc0e4 am 32371695: Merge "GpsLocationProvider: Fix race condition while bringing up APN for SUPL." into gingerbread
Merge commit '32371695daf917701f78a86224b58bfda0381e27' into gingerbread-plus-aosp

* commit '32371695daf917701f78a86224b58bfda0381e27':
  GpsLocationProvider: Fix race condition while bringing up APN for SUPL.
2010-09-22 09:57:50 -07:00
Mike Lockwood
32371695da Merge "GpsLocationProvider: Fix race condition while bringing up APN for SUPL." into gingerbread 2010-09-22 09:54:53 -07:00
Hung-ying Tyan
8f05b5c8d3 am ca54cdaf: Merge "SipService: fix thread/socket leak" into gingerbread
Merge commit 'ca54cdaf66449cd4f81d8887ec603392b8f3779c' into gingerbread-plus-aosp

* commit 'ca54cdaf66449cd4f81d8887ec603392b8f3779c':
  SipService: fix thread/socket leak
2010-09-22 09:41:17 -07:00
Hung-ying Tyan
ca54cdaf66 Merge "SipService: fix thread/socket leak" into gingerbread 2010-09-22 09:35:35 -07:00
Mike Lockwood
2acfd34ccb GpsLocationProvider: Fix race condition while bringing up APN for SUPL.
If handleUpdateNetworkState() is called before
ConnectivityManager.startUsingNetworkFeature() returns, then we will not
call native_agps_data_conn_open() to inform the GPS that the APN is up.
So we now set mAGpsDataConnectionState to AGPS_DATA_CONNECTION_OPENING
before calling ConnectivityManager.startUsingNetworkFeature() to avoid
this problem.

Change-Id: I5e1597d6494dc8ab68e608911c546a7a04f2ea07
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-22 12:22:26 -04:00
Hung-ying Tyan
fc51f2c972 SipService: fix thread/socket leak
Should call SipSessionGroup.close() instead of closeNotToReceiveCalls() to stop
the SIP stack (which will stop the MessageProcessor thread and close its socket).

Might be related to ANR's reported by:
http://b/issue?id=3021924
http://b/issue?id=3021927

Change-Id: I4ead1d81fc9abac983f5753b825d20bc1cc79866
2010-09-23 00:02:34 +08:00
Jeff Brown
77d9a5a55f am 98bcb41d: Merge "Fix race reading input configuration during system startup." into gingerbread
Merge commit '98bcb41d9b434bbe486b33681d9d091d6072d1f1' into gingerbread-plus-aosp

* commit '98bcb41d9b434bbe486b33681d9d091d6072d1f1':
  Fix race reading input configuration during system startup.
2010-09-21 18:39:39 -07:00
Jeff Brown
57c59376f4 Fix race reading input configuration during system startup.
Change-Id: I9360c4ec5c29937fce06b44ffc71fca58c8b3d5f
2010-09-21 18:22:55 -07:00
Irfan Sheriff
d404a9be14 am 0859b764: Make wifi scan async. (don\'t auto-merge)
Merge commit '0859b764719735e4b9aea5df6051ece13e212841' into gingerbread-plus-aosp

* commit '0859b764719735e4b9aea5df6051ece13e212841':
  Make wifi scan async. (don't auto-merge)
2010-09-21 12:59:34 -07:00
Irfan Sheriff
0859b76471 Make wifi scan async. (don't auto-merge)
When an entity (NLP for example) acquires
a WifiLock and initiates a scan, scan can
get blocked until driver starts.

scan returns no useful info, scan results
are broadcast when obtained.

Bug: 2964633
Change-Id: Iaefc32bb6b82f0718285a18ac600e6bbbb096e77
2010-09-21 12:38:09 -07:00
Robert Greenwalt
f532e9583e am 6548f395: Merge "Inet status bug fix" into gingerbread
Merge commit '6548f395a974d2a8dcefe29b3a498d1ca87d8aef' into gingerbread-plus-aosp

* commit '6548f395a974d2a8dcefe29b3a498d1ca87d8aef':
  Inet status bug fix
2010-09-21 08:22:59 -07:00
Robert Greenwalt
6548f395a9 Merge "Inet status bug fix" into gingerbread 2010-09-21 08:06:15 -07:00
Robert Greenwalt
029be81302 Inet status bug fix
Don't wipe out the connected status every time we get a cellular status change.
Don't filter out disconnect event for wifi - we need them.

bug:3009923
Change-Id: I68cadac5f44d6eb4e0fe711fda7c5d218abb45bd
2010-09-21 05:38:36 -07:00
Dianne Hackborn
e665698ffe am 6f33b65f: Merge "Fix issue #2999757: "Application Redirected" dialogue showing up erratically" into gingerbread
Merge commit '6f33b65f8033cf8644eb4ba727421b90bd4c0ae9' into gingerbread-plus-aosp

* commit '6f33b65f8033cf8644eb4ba727421b90bd4c0ae9':
  Fix issue #2999757: "Application Redirected" dialogue showing up erratically
2010-09-21 00:27:06 -07:00
Dianne Hackborn
034093a4ae Fix issue #2999757: "Application Redirected" dialogue showing up erratically
Give up on this for now.

Change-Id: Ic66a36d468f8bcb313d9bde2809124cdfd74adb3
2010-09-20 22:24:38 -07:00
Dianne Hackborn
2d19a67686 am 51aaab3d: Merge "Fix #2999258: ANR in Settings after every reboot" into gingerbread
Merge commit '51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d' into gingerbread-plus-aosp

* commit '51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d':
  Fix #2999258: ANR in Settings after every reboot
2010-09-20 22:22:54 -07:00
Dianne Hackborn
51aaab3d6b Merge "Fix #2999258: ANR in Settings after every reboot" into gingerbread 2010-09-20 22:19:47 -07:00
Robert Greenwalt
749e6bc5cc am 313af5a3: Merge "Add Inet Condition log to bugreports" into gingerbread
Merge commit '313af5a3b5ba51eb75dea35eb568c841aa4beb6a' into gingerbread-plus-aosp

* commit '313af5a3b5ba51eb75dea35eb568c841aa4beb6a':
  Add Inet Condition log to bugreports
2010-09-20 21:31:29 -07:00
Robert Greenwalt
313af5a3b5 Merge "Add Inet Condition log to bugreports" into gingerbread 2010-09-20 21:29:02 -07:00
Dianne Hackborn
8891fdc1da Fix #2999258: ANR in Settings after every reboot
The main problem here was in the error recovery when we are waiting
for a process to start but it has failed for some reason.  The code
was just setting mPendingBroadcast to null, but this would cause
an eventual ANR because the state was not set back to IDLE so we
would continue waiting for the broadcast without trying to restart
its process.

Now we set it to idle.  We also need to reset the "nextReceiver"
index, so there is a new mPendingBroadcastRecvIndex variable holding
what it should be set back to.

While digging into this, I found a number of other lesser problems:

- There is a race when booting the system where we set mSystemReady
to true before restarting the upgrade processes.  This could allow
a broadcast to happen between those two and its process to immediately
be removed.  To fix this, there is a new mProcessesReady that is set
once we are truly ready to start launching processes.

- There were various places where we were calling sendBroadcastLocked()
without the flag to send only to receivers...  if this is called before
mProcessesReady is set, then we would end up sticking any process for
the broadcast on the holding list to not get launched until later
(and hang up all broadcasts as they want for it).  Now we always make
sure to set this appropriately.

- sendBroadcastInPackage() was not doing all of the validation that
sendBroadcast() does.

And of course a bunch of new debugging logs that were done in the
course of tracking this down.

Change-Id: I6134bbd94fdb73db8b693507b29499eae012d543
2010-09-20 20:52:51 -07:00
Mike Lockwood
24956d36f4 am 307aef01: Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread
Merge commit '307aef01257cbba42f095f7020a4a3b753f3807b' into gingerbread-plus-aosp

* commit '307aef01257cbba42f095f7020a4a3b753f3807b':
  LocationManager: Hide location provider and geocode provider APIs.
2010-09-20 17:19:04 -07:00
Mike Lockwood
307aef0125 Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread 2010-09-20 17:16:03 -07:00
Mike Lockwood
e15735a9e0 LocationManager: Hide location provider and geocode provider APIs.
Also rename Geocoder.isImplemented() to Geocoder.isPresent()

BUG: 3000738
BUG: 3001413

Change-Id: I56bb4e9a9c59f8b79de585eeb168f74c3ff1a853
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-20 20:14:34 -04:00
Dianne Hackborn
0ce12e210e am e25a264c: Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread
Merge commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15' into gingerbread-plus-aosp

* commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15':
  DO NOT MERGE.  Wifi service now blames apps for its wake lock use.
2010-09-20 17:06:12 -07:00
Dianne Hackborn
e25a264c4e Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread 2010-09-20 17:03:15 -07:00
Dianne Hackborn
c8314b05b4 DO NOT MERGE. Wifi service now blames apps for its wake lock use.
Change-Id: Ic57d8f77527bbfea6a129b8f348fe9108157b4d8
2010-09-20 16:58:41 -07:00
Dianne Hackborn
65b5a65e79 am 4db643eb: Merge "In theory the package manager now scans /vendor/app" into gingerbread
Merge commit '4db643eb8430d063b1adc4ba164bfa1c1281bdf3' into gingerbread-plus-aosp

* commit '4db643eb8430d063b1adc4ba164bfa1c1281bdf3':
  In theory the package manager now scans /vendor/app
2010-09-20 16:57:05 -07:00
Dianne Hackborn
4db643eb84 Merge "In theory the package manager now scans /vendor/app" into gingerbread 2010-09-20 16:54:22 -07:00
Dianne Hackborn
3b4bac7a2a In theory the package manager now scans /vendor/app
Not tested.

Change-Id: Ib6120d645074c95dd0afd1476f6167aec5d50bb9
2010-09-20 16:35:22 -07:00
Dianne Hackborn
4b187e804f am 8e1b84e7: Merge "Some battery improvements:" into gingerbread
Merge commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b' into gingerbread-plus-aosp

* commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b':
  Some battery improvements:
2010-09-20 16:34:45 -07:00
Dianne Hackborn
ce2ef766ca Some battery improvements:
- New API for iterating over history that will allow a better implementation
  in the future.
- Now do writes asynchronously.

Also improve the documentation for Activity.onRetainNonInstanceState().

Change-Id: Idf67f2796a8868eb62f288bcbb2bad29876c8554
2010-09-20 16:25:01 -07:00
Robert Greenwalt
4e8dfefb06 Add Inet Condition log to bugreports
Reports who reports what condition on which network at what time.  Where is implied.

Change-Id: I89fbc7323dec438041859fcc934169fa325f0133
2010-09-20 16:00:44 -07:00
Hung-ying Tyan
97bc368bc4 am b17eae9e: SipService: move event handling out of system server\'s main thread
Merge commit 'b17eae9e227475a323f61519abc8a7d35ddf8828' into gingerbread-plus-aosp

* commit 'b17eae9e227475a323f61519abc8a7d35ddf8828':
  SipService: move event handling out of system server's main thread
2010-09-19 19:14:30 -07:00
Hung-ying Tyan
b17eae9e22 SipService: move event handling out of system server's main thread
http://b/issue?id=2998047

Change-Id: Ibe0b6a19bb8b453fa852a94b3daf3cb80d7377b0
2010-09-20 10:10:34 +08:00
Hung-ying Tyan
37d1b2496e am 97963794: SIP: convert enum to static final int.
Merge commit '97963794af1e18674dd111e3ad344d90b16c922c' into gingerbread-plus-aosp

* commit '97963794af1e18674dd111e3ad344d90b16c922c':
  SIP: convert enum to static final int.
2010-09-19 18:56:27 -07:00
Hung-ying Tyan
97963794af SIP: convert enum to static final int.
Converts SipErrorCode and SipSessionState.

Change-Id: Iee3a465649ea89d395b2336bbd673c25113e5f93
2010-09-20 09:51:31 +08:00
Hung-ying Tyan
cf1620d6dd am 5b930c49: Merge "SIP: add config flag for wifi-only configuration." into gingerbread
Merge commit '5b930c49b12bdb1461a18491db768c642c38d498' into gingerbread-plus-aosp

* commit '5b930c49b12bdb1461a18491db768c642c38d498':
  SIP: add config flag for wifi-only configuration.
2010-09-19 18:11:44 -07:00
Hung-ying Tyan
5b930c49b1 Merge "SIP: add config flag for wifi-only configuration." into gingerbread 2010-09-19 18:02:13 -07:00
Hung-ying Tyan
c4b87477c0 SIP: add config flag for wifi-only configuration.
http://b/issue?id=2994029

Change-Id: I328da9b0f8b70d660dbcefffdac8250341792101
2010-09-20 08:03:20 +08:00
Mike Lockwood
b5994789af am ba56dfce: DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
Merge commit 'ba56dfce7c751081f2289aa33533dcf4822dc12b' into gingerbread-plus-aosp

* commit 'ba56dfce7c751081f2289aa33533dcf4822dc12b':
  DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
2010-09-19 11:10:57 -07:00
Mike Lockwood
ba56dfce7c DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
This change is already in master

On some devices, switching the USB configuration to enable RNDIS can
result in multiple USB disconnect/reconnect events being generated.

Change-Id: I14b02aaca11bb708f6b3334e41a2f4d4fa7b7296
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-19 14:04:38 -04:00
Dianne Hackborn
1f377298e2 am 58e0eefe: Improve power tracking of WIFI use.
Merge commit '58e0eefeb5e2e270e2b04369bbf29fc22abda8d5' into gingerbread-plus-aosp

* commit '58e0eefeb5e2e270e2b04369bbf29fc22abda8d5':
  Improve power tracking of WIFI use.
2010-09-17 15:20:10 -07:00
Dianne Hackborn
58e0eefeb5 Improve power tracking of WIFI use.
We now distribute "wifi started" time across all apps that are
holding WIFI locks that cause it to be started.  But only when
WIFI would not normally be running.  Also have a mechanism to
distribute other WIFI work that has happened across those processes
based on their use.

Also fixed a bug where we were not retaining the CPU speed step
stats across boots...!

Change-Id: I00e3153b98429166273750512cc37e7975211ab9
2010-09-17 15:14:57 -07:00
Hung-ying Tyan
156edcc9f6 am 9404e633: Merge "Add timer to SIP session creation process." into gingerbread
Merge commit '9404e633a55cd325b57732cdd776053b3886b611' into gingerbread-plus-aosp

* commit '9404e633a55cd325b57732cdd776053b3886b611':
  Add timer to SIP session creation process.
2010-09-16 23:40:28 -07:00
Hung-ying Tyan
9404e633a5 Merge "Add timer to SIP session creation process." into gingerbread 2010-09-16 23:30:49 -07:00
Hung-ying Tyan
9352cf1a4d Add timer to SIP session creation process.
+ add timer parameter to ISipSession.make/changeCall(),
+ add timer paramter to SipAudioCall.make/answer/hold/continueCall()'s,
+ add timer parameter to SipManager.makeAudioCall(),
+ modify implementation in SipSessionGroup, SipAudioCallImpl accordingly,
+ make SipPhone to use it with 8-second timeout.

http://b/issue?id=2994748

Change-Id: I661a887e5810087ddc5e2318335e2fa427f80ec6
2010-09-17 13:31:05 +08:00
Mathias Agopian
793b229379 am 1bcb8b1a: Merge "surfaceflinger / GL extensions cleanup" into gingerbread
Merge commit '1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69' into gingerbread-plus-aosp

* commit '1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69':
  surfaceflinger / GL extensions cleanup
2010-09-16 17:57:34 -07:00
Mathias Agopian
1bcb8b1afb Merge "surfaceflinger / GL extensions cleanup" into gingerbread 2010-09-16 17:55:05 -07:00
Jeff Brown
6f0ff46c6f am 9c258710: Merge "Fix app switch latency optimization." into gingerbread
Merge commit '9c2587104ae259b9fa6a3525063197cc08e8820b' into gingerbread-plus-aosp

* commit '9c2587104ae259b9fa6a3525063197cc08e8820b':
  Fix app switch latency optimization.
2010-09-16 17:15:48 -07:00
Jeff Brown
54a1825121 Fix app switch latency optimization.
This optimization was broken due to recent changes in how ANRs are handled.

Change-Id: Ic99248a12755fadac8d4893e7d305b773e038d3d
2010-09-16 16:41:46 -07:00