drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I50a321c9 into eclair

Browse Source 
* changes:
  LocationManagerService: Fix race when removing LocationListener
This commit is contained in:
Android (Google) Code Review
2009-10-08 12:58:48 -04:00
parent e929687614 080b61ba17
commit bd324c9bd3
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/java/com/android/server/LocationManagerService.java
View File

@ -382,7 +382,12 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
} }
public void locationCallbackFinished(ILocationListener listener) { public void locationCallbackFinished(ILocationListener listener) {
Receiver receiver = getReceiver(listener); //Do not use getReceiver here as that will add the ILocationListener to
//the receiver list if it is not found. If it is not found then the
//LocationListener was removed when it had a pending broadcast and should
//not be added back.
IBinder binder = listener.asBinder();
Receiver receiver = mReceivers.get(binder);
if (receiver != null) { if (receiver != null) {
synchronized (receiver) { synchronized (receiver) {
// so wakelock calls will succeed // so wakelock calls will succeed
@ -921,6 +926,12 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
try { try {
if (mReceivers.remove(receiver.mKey) != null && receiver.isListener()) { if (mReceivers.remove(receiver.mKey) != null && receiver.isListener()) {
receiver.getListener().asBinder().unlinkToDeath(receiver, 0); receiver.getListener().asBinder().unlinkToDeath(receiver, 0);
synchronized(receiver) {
if(receiver.mPendingBroadcasts > 0) {
decrementPendingBroadcasts();
receiver.mPendingBroadcasts = 0;
}
}
} }
// Record which providers were associated with this listener // Record which providers were associated with this listener