diff options
| author | 2022-04-29 05:11:26 +0000 | |
|---|---|---|
| committer | 2022-04-29 05:11:26 +0000 | |
| commit | 9caec02cb79aedadc33d173ec4d5082371d56dce (patch) | |
| tree | fb38c34a4cf54b238f391c4b527ca8698ac0dba1 | |
| parent | f71832b46bcae438cc5c7379fcfc1094392b729e (diff) | |
| parent | 56774980c41d0187629661affd2ea2c09924ab27 (diff) | |
Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev
| -rw-r--r-- | core/java/android/provider/Settings.java | 29 | ||||
| -rw-r--r-- | packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java | 1 |
2 files changed, 16 insertions, 14 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 34647b144be1..731b5315c7fb 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7679,20 +7679,6 @@ public final class Settings { "zen_settings_suggestion_viewed"; /** - * State of whether review notification permissions notification needs to - * be shown the user, and whether the user has interacted. - * - * Valid values: - * -1 = UNKNOWN - * 0 = SHOULD_SHOW - * 1 = USER_INTERACTED - * 2 = DISMISSED - * @hide - */ - public static final String REVIEW_PERMISSIONS_NOTIFICATION_STATE = - "review_permissions_notification_state"; - - /** * Whether the in call notification is enabled to play sound during calls. The value is * boolean (1 or 0). * @hide @@ -16966,6 +16952,21 @@ public final class Settings { "managed_provisioning_defer_provisioning_to_role_holder"; /** + * State of whether review notification permissions notification needs to + * be shown the user, and whether the user has interacted. + * + * Valid values: + * -1 = UNKNOWN + * 0 = SHOULD_SHOW + * 1 = USER_INTERACTED + * 2 = DISMISSED + * 3 = RESHOWN + * @hide + */ + public static final String REVIEW_PERMISSIONS_NOTIFICATION_STATE = + "review_permissions_notification_state"; + + /** * Settings migrated from Wear OS settings provider. * @hide */ diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index f1b23d5733af..4b7d0d2a3c74 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -597,6 +597,7 @@ public class SettingsBackupTest { Settings.Global.CLOCKWORK_HOME_READY, Settings.Global.WATCHDOG_TIMEOUT_MILLIS, Settings.Global.MANAGED_PROVISIONING_DEFER_PROVISIONING_TO_ROLE_HOLDER, + Settings.Global.REVIEW_PERMISSIONS_NOTIFICATION_STATE, Settings.Global.Wearable.BATTERY_SAVER_MODE, Settings.Global.Wearable.COMBINED_LOCATION_ENABLED, Settings.Global.Wearable.HAS_PAY_TOKENS, |