Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE in LocationProviderManager

Browse Source 
Bug: 187449017
Test: presubmits
Change-Id: Ieb722a2247f2db2a13c7f526c0de5f6e503fa246
This commit is contained in:
Soonil Nagarkar
2021-05-07 09:26:36 -07:00
parent ff09af37dd
commit 259d6e2982
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/location/provider/LocationProviderManager.java
View File

@@ -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")
@@ -2270,6 +2281,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)) {