From 21493742752945df8086159321b8331ce7c62c16 Mon Sep 17 00:00:00 2001 From: Aleksa Plavsic Date: Thu, 22 Dec 2022 16:34:03 +0000 Subject: [PATCH] Add constants releted to communication between SetupWizard and WearServices - This constants are used in OEM Setup Bug: 260571511 Test: make -j48 Change-Id: I14122de1654f071292b0dab9c62442ec0de7d4e5 (cherry picked from commit b938311bd0cc22fd25b00fe853ff6266a9882b2b) --- core/java/android/provider/Settings.java | 22 +++++++++++++++++++ .../validators/GlobalSettingsValidators.java | 7 ++++++ .../android/provider/SettingsBackupTest.java | 1 + 3 files changed, 30 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 718e212b61b79..6308180fab7fa 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -17910,6 +17910,28 @@ public final class Settings { */ public static final String OEM_SETUP_VERSION = "oem_setup_version"; + /** + * The key to indicate to Setup Wizard if OEM setup is completed in Wear Services. + * @hide + */ + public static final String OEM_SETUP_COMPLETED_STATUS = "oem_setup_completed_status"; + + /** + * Constant provided to Setup Wizard to inform about failure of OEM setup in Wear + * Services. The value should be provided with setting name {@link + * #OEM_SETUP_COMPLETED_STATUS}. + * @hide + */ + public static final int OEM_SETUP_COMPLETED_FAILURE = 0; + + /** + * Constant provided to Setup Wizard to inform about successful completion of OEM setup + * in Wear Services. The value should be provided with setting name {@link + * #OEM_SETUP_COMPLETED_STATUS}. + * @hide + */ + public static final int OEM_SETUP_COMPLETED_SUCCESS = 1; + /** * Controls the gestures feature. * @hide diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index 46876b457b549..edf73805c0db7 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -305,6 +305,13 @@ public class GlobalSettingsValidators { 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); + VALIDATORS.put( + Global.Wearable.OEM_SETUP_COMPLETED_STATUS, + new DiscreteValueValidator( + new String[] { + String.valueOf(Global.Wearable.OEM_SETUP_COMPLETED_FAILURE), + String.valueOf(Global.Wearable.OEM_SETUP_COMPLETED_SUCCESS), + })); VALIDATORS.put(Global.Wearable.MASTER_GESTURES_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.UNGAZE_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put( diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 4365a9b441b13..45dfd8b037aa1 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -645,6 +645,7 @@ public class SettingsBackupTest { Settings.Global.Wearable.ENABLE_ALL_LANGUAGES, Settings.Global.Wearable.SETUP_LOCALE, Settings.Global.Wearable.OEM_SETUP_VERSION, + Settings.Global.Wearable.OEM_SETUP_COMPLETED_STATUS, Settings.Global.Wearable.MASTER_GESTURES_ENABLED, Settings.Global.Wearable.UNGAZE_ENABLED, Settings.Global.Wearable.BURN_IN_PROTECTION_ENABLED,