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
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 34647b1..731b531 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7679,20 +7679,6 @@
"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 @@
"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 f1b23d5..4b7d0d2 100644
--- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
+++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
@@ -597,6 +597,7 @@
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,
