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

Add new key to System Content Provider for combined location

Browse Source 
Bug: 185927316
Test: tests run as part of topic thru the other CL; no extra tests for
this change alone.
Change-Id: I76e21b2f3731f4e556713ad86bc7bd29e467c583

Change-Id: I0bc606e9cf438705166f76872495f2e84dee55d3
(cherry picked from commit 0e20158cf7651d298af879209f81bfae115c253d)
This commit is contained in:
Harshad Dhabu
2021-05-13 18:14:53 +00:00
committed by Yeabkal Assegid Wubshit
parent d7935a531f
commit 95b8d682d3
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/provider/Settings.java
View File

@@ -16770,6 +16770,12 @@ public final class Settings {
* @hide
*/
public static final String BURN_IN_PROTECTION_ENABLED = "burn_in_protection";
/**
* Whether the device has combined location setting enabled.
* @hide
*/
public static final String COMBINED_LOCATION_ENABLED = "combined_location_enable";
}
}

1
packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java
View File

@@ -311,6 +311,7 @@ public class GlobalSettingsValidators {
Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS,
NON_NEGATIVE_INTEGER_VALIDATOR);
VALIDATORS.put(Global.Wearable.BURN_IN_PROTECTION_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.Wearable.COMBINED_LOCATION_ENABLED, BOOLEAN_VALIDATOR);
}
}