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

Commit faf6bc77 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix deadlock in GeofenceManager"

parents 63ebfcba 8c4655e0

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

+25 −25
Original line number Diff line number Diff line
@@ -2643,6 +2643,7 @@ public class LocationManagerService extends ILocationManager.Stub { 
        synchronized (mLock) {

            checkResolutionLevelIsSufficientForProviderUseLocked(allowedResolutionLevel,

                    request.getProvider());

        }

        // Require that caller can manage given document

        boolean callerHasLocationHardwarePermission =

                mContext.checkCallingPermission(android.Manifest.permission.LOCATION_HARDWARE)
@@ -2671,7 +2672,6 @@ public class LocationManagerService extends ILocationManager.Stub { 
            Binder.restoreCallingIdentity(identity);

        }

    }

    }



    @Override

    public void removeGeofence(Geofence geofence, PendingIntent intent, String packageName) {