From bb07463bfb82f8c08ce760728d52bcd4017a76f6 Mon Sep 17 00:00:00 2001 From: Josh Yang Date: Tue, 10 Nov 2020 23:16:14 -0800 Subject: [PATCH] Move KEY_OEM_SETUP_VERSION to system provider Bug: 172977193 Test: manual test Change-Id: I93534ea01cb9a1b9bf53ecd84d4a9f61350a7500 (cherry picked from commit 013788079ca377165f76e7a8c95888fb06a72549) --- core/java/android/provider/Settings.java | 6 ++++++ .../settings/validators/GlobalSettingsValidators.java | 1 + .../test/src/android/provider/SettingsBackupTest.java | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index d283bd136386e..d6d34126c49ad 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -16666,6 +16666,12 @@ public final class Settings { * @hide */ public static final String SETUP_LOCALE = "setup_locale"; + + /** + * The version of oem setup present. + * @hide + */ + public static final String OEM_SETUP_VERSION = "oem_setup_version"; } } diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index 690ace78fa993..a9245f8a40e16 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -291,6 +291,7 @@ public class GlobalSettingsValidators { VALIDATORS.put(Global.Wearable.HFP_CLIENT_PROFILE_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.COMPANION_OS_VERSION, ANY_INTEGER_VALIDATOR); VALIDATORS.put(Global.Wearable.ENABLE_ALL_LANGUAGES, BOOLEAN_VALIDATOR); + VALIDATORS.put(Global.Wearable.OEM_SETUP_VERSION, ANY_INTEGER_VALIDATOR); } } diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 9e65799eeb3ff..f66d014ce3970 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -654,7 +654,8 @@ public class SettingsBackupTest { Settings.Global.Wearable.HFP_CLIENT_PROFILE_ENABLED, Settings.Global.Wearable.COMPANION_OS_VERSION, Settings.Global.Wearable.ENABLE_ALL_LANGUAGES, - Settings.Global.Wearable.SETUP_LOCALE); + Settings.Global.Wearable.SETUP_LOCALE, + Settings.Global.Wearable.OEM_SETUP_VERSION); private static final Set BACKUP_DENY_LIST_SECURE_SETTINGS = newHashSet(