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

Commit 8c4655e0 authored by Soonil Nagarkar's avatar Soonil Nagarkar
Browse files

Fix deadlock in GeofenceManager 

GeofenceManager has threading bugs, but it's much easier to relax the
guarantees in LMS than to actually fix GeofenceManager.

Bug: 124648800
Test: manually
Change-Id: I429b7c60d545c7f9503178c9a5be0d0bcd2f33b0
parent 6cde0385

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) {