From 95b8d682d3654a2f3ed4fb217a4617c7d8a92b43 Mon Sep 17 00:00:00 2001 From: Harshad Dhabu Date: Thu, 13 May 2021 18:14:53 +0000 Subject: [PATCH] Add new key to System Content Provider for combined location 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) --- core/java/android/provider/Settings.java | 6 ++++++ .../settings/validators/GlobalSettingsValidators.java | 1 + 2 files changed, 7 insertions(+) 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); } }