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

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

Merge "Fix nondeterminism in LMS"

parents ef0d3861 66c0bace

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

+7 −6
Original line number Diff line number Diff line
@@ -1041,12 +1041,13 @@ public class LocationManagerService extends ILocationManager.Stub { 


        @Override

        public void onSetProperties(ProviderProperties properties) {

            // move calls coming from below LMS onto a different thread to avoid deadlock

            runInternal(() -> {

            // because this does not invoke any other methods which might result in calling back

            // into the location provider, it is safe to run this on the calling thread. it is also

            // currently necessary to run this on the calling thread to ensure that property changes

            // are publicly visibly immediately, ie for mock providers which are created.

            synchronized (mLock) {

                mProperties = properties;

            }

            });

        }



        @GuardedBy("mLock")

services/core/java/com/android/server/location/MockProvider.java

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ public class MockProvider extends AbstractLocationProvider { 
        mExtras = null;



        setProperties(properties);

        setEnabled(true);

    }



    /** Sets the enabled state of this mock provider. */