diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 66d14e511da9d..4a950b84b1ac9 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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"; } } diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index bc10093158689..9ad8b56bd5ec9 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -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); } }