Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c9034c9 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into... 

Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 9caec02c am: 45d571ef am: 15529224

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17872747



Change-Id: I3709703bc34d0dcd9e1ef8fe545b2cf918774a23
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dcd7953b 15529224

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).










@@ -16973,6 +16959,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

























packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+1
−0






























Original line number
Diff line number
Diff line








@@ -598,6 +598,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,