Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev

Browse Source
This commit is contained in:
Julia Reynolds
2022-04-29 05:11:26 +00:00
committed by Android (Google) Code Review
parent f71832b46b 56774980c4
commit 9caec02cb7
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/android/provider/Settings.java
View File

@@ -7678,20 +7678,6 @@ public final class Settings {
public static final String ZEN_SETTINGS_SUGGESTION_VIEWED = public static final String ZEN_SETTINGS_SUGGESTION_VIEWED =
"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 * Whether the in call notification is enabled to play sound during calls. The value is
* boolean (1 or 0). * boolean (1 or 0).
@@ -16965,6 +16951,21 @@ public final class Settings {
public static final String MANAGED_PROVISIONING_DEFER_PROVISIONING_TO_ROLE_HOLDER = public static final String MANAGED_PROVISIONING_DEFER_PROVISIONING_TO_ROLE_HOLDER =
"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. * Settings migrated from Wear OS settings provider.
* @hide * @hide

1
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -597,6 +597,7 @@ public class SettingsBackupTest {
Settings.Global.CLOCKWORK_HOME_READY, Settings.Global.CLOCKWORK_HOME_READY,
Settings.Global.WATCHDOG_TIMEOUT_MILLIS, Settings.Global.WATCHDOG_TIMEOUT_MILLIS,
Settings.Global.MANAGED_PROVISIONING_DEFER_PROVISIONING_TO_ROLE_HOLDER, Settings.Global.MANAGED_PROVISIONING_DEFER_PROVISIONING_TO_ROLE_HOLDER,
Settings.Global.REVIEW_PERMISSIONS_NOTIFICATION_STATE,
Settings.Global.Wearable.BATTERY_SAVER_MODE, Settings.Global.Wearable.BATTERY_SAVER_MODE,
Settings.Global.Wearable.COMBINED_LOCATION_ENABLED, Settings.Global.Wearable.COMBINED_LOCATION_ENABLED,
Settings.Global.Wearable.HAS_PAY_TOKENS, Settings.Global.Wearable.HAS_PAY_TOKENS,