Skip to content

Commit 01ed75c

Browse files
author
Nick Pelly
committed
Fix NPE when public API removeProximityAlert() used before addProximityAlert().
Bug: 6313992 Change-Id: I905ad9ea771286727ce4a3a2334f2a0dac967c3d
1 parent 059537e commit 01ed75c

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

services/java/com/android/server/LocationManagerService.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1702,7 +1702,9 @@ private void removeProximityAlertLocked(PendingIntent intent) {
17021702

17031703
mProximityAlerts.remove(intent);
17041704
if (mProximityAlerts.size() == 0) {
1705-
removeUpdatesLocked(mProximityReceiver);
1705+
if (mProximityReceiver != null) {
1706+
removeUpdatesLocked(mProximityReceiver);
1707+
}
17061708
mProximityReceiver = null;
17071709
mProximityListener = null;
17081710
}

0 commit comments

Comments
 (0)