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

Commit d2a74b2c authored by Soonil Nagarkar's avatar Soonil Nagarkar Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in LocationProviderManager" into sc-dev am: 93f7083e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14468644

Change-Id: I295d73cf18a37f57e6c1c33291d748f1fa4292df
parents 09719989 93f7083e

services/core/java/com/android/server/location/provider/LocationProviderManager.java

+16 −1
Original line number Diff line number Diff line
@@ -461,6 +461,12 @@ public class LocationProviderManager extends 
            return LocationProviderManager.this;

        }



        @GuardedBy("mLock")

        final boolean onProviderPropertiesChanged() {

            onHighPowerUsageChanged();

            return false;

        }



        @GuardedBy("mLock")

        private void onHighPowerUsageChanged() {

            boolean isUsingHighPower = isUsingHighPower();
@@ -485,9 +491,14 @@ public class LocationProviderManager extends 
                Preconditions.checkState(Thread.holdsLock(mLock));

            }



            ProviderProperties properties = getProperties();

            if (properties == null) {

                return false;

            }



            return isActive()

                    && getRequest().getIntervalMillis() < MAX_HIGH_POWER_INTERVAL_MS

                    && getProperties().getPowerUsage() == ProviderProperties.POWER_USAGE_HIGH;

                    && properties.getPowerUsage() == ProviderProperties.POWER_USAGE_HIGH;

        }



        @GuardedBy("mLock")
@@ -2277,6 +2288,10 @@ public class LocationProviderManager extends 
            onEnabledChanged(UserHandle.USER_ALL);

        }



        if (!Objects.equals(oldState.properties, newState.properties)) {

            updateRegistrations(Registration::onProviderPropertiesChanged);

        }



        if (mOnLocationTagsChangeListener != null) {

            if (!oldState.extraAttributionTags.equals(newState.extraAttributionTags)

                    || !Objects.equals(oldState.identity, newState.identity)) {