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

Commit bfd125a0 authored by Nick Pelly's avatar Nick Pelly Committed by Android (Google) Code Review
Browse files

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

parents a1d40e47 01ed75c8

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;

        }