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

Commit f5fdca9d authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Maybe fix issue #9296868: Crash in system process 

There were some paths in LocationManagerService where
mRecivers was being accessed/modified without the lock held.
Update method names to indicate they need to be called with
lock held to make it more clear in the future when such a
problem may happen.

Change-Id: Ie2a9d019155ac7cedd1db298caca75b8fe382ca7
parent 379517b0

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

+28 −23
Original line number Diff line number Diff line
@@ -685,10 +685,11 @@ public class LocationManagerService extends ILocationManager.Stub { 


    @Override

    public void locationCallbackFinished(ILocationListener listener) {

        //Do not use getReceiver here as that will add the ILocationListener to

        //Do not use getReceiverLocked here as that will add the ILocationListener to

        //the receiver list if it is not found.  If it is not found then the

        //LocationListener was removed when it had a pending broadcast and should

        //not be added back.

        synchronized (mLock) {

            IBinder binder = listener.asBinder();

            Receiver receiver = mReceivers.get(binder);

            if (receiver != null) {
@@ -700,6 +701,7 @@ public class LocationManagerService extends ILocationManager.Stub { 
               }

            }

        }

    }



    private void addProviderLocked(LocationProviderInterface provider) {

        mProviders.add(provider);
@@ -1179,7 +1181,8 @@ public class LocationManagerService extends ILocationManager.Stub { 
        }

    }



    private Receiver getReceiver(ILocationListener listener, int pid, int uid, String packageName) {

    private Receiver getReceiverLocked(ILocationListener listener, int pid, int uid,

            String packageName) {

        IBinder binder = listener.asBinder();

        Receiver receiver = mReceivers.get(binder);

        if (receiver == null) {
@@ -1196,7 +1199,7 @@ public class LocationManagerService extends ILocationManager.Stub { 
        return receiver;

    }



    private Receiver getReceiver(PendingIntent intent, int pid, int uid, String packageName) {

    private Receiver getReceiverLocked(PendingIntent intent, int pid, int uid, String packageName) {

        Receiver receiver = mReceivers.get(intent);

        if (receiver == null) {

            receiver = new Receiver(null, intent, pid, uid, packageName);
@@ -1260,7 +1263,7 @@ public class LocationManagerService extends ILocationManager.Stub { 
        }

    }



    private Receiver checkListenerOrIntent(ILocationListener listener, PendingIntent intent,

    private Receiver checkListenerOrIntentLocked(ILocationListener listener, PendingIntent intent,

            int pid, int uid, String packageName) {

        if (intent == null && listener == null) {

            throw new IllegalArgumentException("need either listener or intent");
@@ -1268,9 +1271,9 @@ public class LocationManagerService extends ILocationManager.Stub { 
            throw new IllegalArgumentException("cannot register both listener and intent");

        } else if (intent != null) {

            checkPendingIntent(intent);

            return getReceiver(intent, pid, uid, packageName);

            return getReceiverLocked(intent, pid, uid, packageName);

        } else {

            return getReceiver(listener, pid, uid, packageName);

            return getReceiverLocked(listener, pid, uid, packageName);

        }

    }
@@ -1292,9 +1295,10 @@ public class LocationManagerService extends ILocationManager.Stub { 
            // We don't check for MODE_IGNORED here; we will do that when we go to deliver

            // a location.

            checkLocationAccess(uid, packageName, allowedResolutionLevel);

            Receiver recevier = checkListenerOrIntent(listener, intent, pid, uid, packageName);



            synchronized (mLock) {

                Receiver recevier = checkListenerOrIntentLocked(listener, intent, pid, uid,

                        packageName);

                requestLocationUpdatesLocked(sanitizedRequest, recevier, pid, uid, packageName);

            }

        } finally {
@@ -1341,18 +1345,19 @@ public class LocationManagerService extends ILocationManager.Stub { 


        final int pid = Binder.getCallingPid();

        final int uid = Binder.getCallingUid();

        Receiver receiver = checkListenerOrIntent(listener, intent, pid, uid, packageName);



        synchronized (mLock) {

            Receiver receiver = checkListenerOrIntentLocked(listener, intent, pid, uid, packageName);



            // providers may use public location API's, need to clear identity

            long identity = Binder.clearCallingIdentity();

            try {

            synchronized (mLock) {

                removeUpdatesLocked(receiver);

            }

            } finally {

                Binder.restoreCallingIdentity(identity);

            }

        }

    }



    private void removeUpdatesLocked(Receiver receiver) {

        if (D) Log.i(TAG, "remove " + Integer.toHexString(System.identityHashCode(receiver)));