Fix Battery Saver location bugs.
1) Actively disabling LOCATION_MODE instead of LOCATION_PROVIDERS_ALLOWED
since the latter is deprecated and not supported.
2) The LOCATION_MODE_FOREGROUND_ONLY flag wasn't used anywhere. As
such, it was essentially no different from LOCATION_MODE_NO_CHANGE. I've
implemented the behavior in LocationManagerService so it works properly.
3) GnssLocationProvider only turned off GPS when the location mode was
LOCATION_MODE_GPS_DISABLED_WHEN_SCREEN_OFF, but not the mode was
LOCATION_MODE_ALL_DISABLED_WHEN_SCREEN_OFF. I've fixed it so GPS is
turned off in both modes.
4) PowerManager looked at the global battery saver state to determine if
the location mode should be used. This was fine for full Battery Saver,
but would be a problem with adaptive Battery Saver. The proper thing to
do is to just look at the local 'batterySaverEnabled' flag.
Bug: 121256487
Bug: 122849003
Bug: 119261320
Test: atest CtsBatterySavingTestCases
Change-Id: I8973d27fb050d9892bb97021712d9cf9743e8939
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index a7ad223..ceafbfa 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -1379,8 +1379,8 @@
}
}
if (enableOverride) {
- if (Secure.LOCATION_PROVIDERS_ALLOWED.equals(name)) {
- final Setting overridden = getLocationProvidersAllowedSetting(owningUserId);
+ if (Secure.LOCATION_MODE.equals(name)) {
+ final Setting overridden = getLocationModeSetting(owningUserId);
if (overridden != null) {
return overridden;
}
@@ -1475,7 +1475,7 @@
return null;
}
- private Setting getLocationProvidersAllowedSetting(int owningUserId) {
+ private Setting getLocationModeSetting(int owningUserId) {
synchronized (mLock) {
final Setting setting = getGlobalSetting(
Global.LOCATION_GLOBAL_KILL_SWITCH);
@@ -1486,7 +1486,7 @@
final SettingsState settingsState = mSettingsRegistry.getSettingsLocked(
SETTINGS_TYPE_SECURE, owningUserId);
return settingsState.new Setting(
- Secure.LOCATION_PROVIDERS_ALLOWED,
+ Secure.LOCATION_MODE,
"", // value
"", // tag
"", // default value
@@ -1497,7 +1497,7 @@
@Override
public boolean update(String value, boolean setDefault, String packageName,
String tag, boolean forceNonSystemPackage) {
- Slog.wtf(LOG_TAG, "update shoudln't be called on this instance.");
+ Slog.wtf(LOG_TAG, "update shouldn't be called on this instance.");
return false;
}
};
@@ -3115,7 +3115,7 @@
final int key = makeKey(SETTINGS_TYPE_SECURE, userId);
mGenerationRegistry.incrementGeneration(key);
- final Uri uri = getNotificationUriFor(key, Secure.LOCATION_PROVIDERS_ALLOWED);
+ final Uri uri = getNotificationUriFor(key, Secure.LOCATION_MODE);
mHandler.obtainMessage(MyHandler.MSG_NOTIFY_URI_CHANGED,
userId, 0, uri).sendToTarget();
}