From 56774980c41d0187629661affd2ea2c09924ab27 Mon Sep 17 00:00:00 2001 From: Yuri Lin Date: Wed, 20 Apr 2022 14:45:56 -0400 Subject: [PATCH] Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure This setting is going to be global across the device rather than per-user. Bug: 225373531 Test: manual Change-Id: Ibabad2192e50d8f495f9e9fcbc12ba93156bc3fa --- core/java/android/provider/Settings.java | 29 ++++++++++--------- .../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 34647b144be11..731b5315c7fbb 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7678,20 +7678,6 @@ public final class Settings { public static final String ZEN_SETTINGS_SUGGESTION_VIEWED = "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). @@ -16965,6 +16951,21 @@ public final class Settings { public static final String MANAGED_PROVISIONING_DEFER_PROVISIONING_TO_ROLE_HOLDER = "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 f1b23d5733af1..4b7d0d2a3c742 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,