Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev (9caec02c) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+15 −14

Original line number	Diff line number	Diff line
		@@ -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

+1 −0

Original line number	Diff line number	Diff line
		@@ -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,