Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01552a5f authored Jul 21, 2021 by TreeHugger Robot Committed by Android (Google) Code Review Jul 21, 2021

Merge "Move KEY_OEM_SETUP_VERSION to system provider"

parents 31409808 bb07463b

core/java/android/provider/Settings.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -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";
		}
		}

packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -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<String> BACKUP_DENY_LIST_SECURE_SETTINGS =
		newHashSet(