diff options
| author | Nick Pelly <npelly@google.com> | 2012-06-13 16:45:27 -0700 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2012-06-13 16:45:27 -0700 |
| commit | 01ed75c82f29b883144d498b4a6a1414d4227a31 (patch) | |
| tree | 70670777d282f4e812d005cb5f660cc495b3260b /services/java/com/android/server/LocationManagerService.java | |
| parent | 059537e7924a5547849b537bf0e50d2f814b80a5 (diff) | |
| download | frameworks_base-01ed75c82f29b883144d498b4a6a1414d4227a31.zip frameworks_base-01ed75c82f29b883144d498b4a6a1414d4227a31.tar.gz frameworks_base-01ed75c82f29b883144d498b4a6a1414d4227a31.tar.bz2 | |
Fix NPE when public API removeProximityAlert() used before addProximityAlert().
Bug: 6313992
Change-Id: I905ad9ea771286727ce4a3a2334f2a0dac967c3d
Diffstat (limited to 'services/java/com/android/server/LocationManagerService.java')
| -rw-r--r-- | services/java/com/android/server/LocationManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java index 985249d..2918dbc 100644 --- a/services/java/com/android/server/LocationManagerService.java +++ b/services/java/com/android/server/LocationManagerService.java @@ -1702,7 +1702,9 @@ public class LocationManagerService extends ILocationManager.Stub implements Run mProximityAlerts.remove(intent); if (mProximityAlerts.size() == 0) { - removeUpdatesLocked(mProximityReceiver); + if (mProximityReceiver != null) { + removeUpdatesLocked(mProximityReceiver); + } mProximityReceiver = null; mProximityListener = null; } |