Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ebd2536 authored by Nick Pelly's avatar Nick Pelly Committed by Android Git Automerger
Browse files

am da58f393: am bfd125a0: Merge "Fix NPE when public API... 

am da58f393: am bfd125a0: Merge "Fix NPE when public API removeProximityAlert() used before addProximityAlert()." into jb-dev

* commit 'da58f393':
  Fix NPE when public API removeProximityAlert() used before addProximityAlert().
parents cce05d2f da58f393

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

+3 −1
Original line number Diff line number Diff line
@@ -1702,7 +1702,9 @@ public class LocationManagerService extends ILocationManager.Stub implements Run 


        mProximityAlerts.remove(intent);

        if (mProximityAlerts.size() == 0) {

            if (mProximityReceiver != null) {

                removeUpdatesLocked(mProximityReceiver);

            }

            mProximityReceiver = null;

            mProximityListener = null;

        }