diff options
| author | 2024-10-04 17:22:09 +0000 | |
|---|---|---|
| committer | 2024-10-04 17:22:09 +0000 | |
| commit | 380b440384af91ed1c3326ea9d68ccb151a2b6e4 (patch) | |
| tree | 04903560226615e0f008eb57f60863c501ee4222 | |
| parent | 6da7b5601ff7cfaf1e314c56d585cd9a961a4fa5 (diff) | |
| parent | b0c46f1c7a7cb4d1da19ec966590a78a7eda76fd (diff) | |
Merge "Add phone switching status for account match success" into main
| -rw-r--r-- | core/java/android/provider/Settings.java | 6 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 1e6f025fdbbe..1919f77ff538 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -20164,6 +20164,12 @@ public final class Settings { public static final int PHONE_SWITCHING_STATUS_IN_PROGRESS_MIGRATION_SUCCESS = 11; /** + * Phone switching has finished account match step. + * @hide + */ + public static final int PHONE_SWITCHING_STATUS_ACCOUNTS_MATCHED = 12; + + /** * Phone switching request source * @hide */ diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index 0773bd701d5c..8f58e8cd1973 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -434,7 +434,7 @@ public class GlobalSettingsValidators { VALIDATORS.put(Global.Wearable.PHONE_SWITCHING_STATUS, new InclusiveIntegerRangeValidator( Global.Wearable.PHONE_SWITCHING_STATUS_NOT_STARTED, - Global.Wearable.PHONE_SWITCHING_STATUS_IN_PROGRESS_MIGRATION_SUCCESS)); + Global.Wearable.PHONE_SWITCHING_STATUS_ACCOUNTS_MATCHED)); VALIDATORS.put(Global.Wearable.REDUCE_MOTION, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.Wearable.RTL_SWIPE_TO_DISMISS_ENABLED_DEV, BOOLEAN_VALIDATOR); VALIDATORS.put( |