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

Commit c9d24262 authored by Rhed Jao's avatar Rhed Jao Committed by Automerger Merge Worker
Browse files

Merge "Add a settings key to expose the device's repair mode state" into... 

Merge "Add a settings key to expose the device's repair mode state" into udc-qpr-dev am: 03dfedbc am: 6951c810

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



Change-Id: If8c7e019d0858dee5fe261df81a1c321085868ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0a7a4162 6951c810

core/java/android/provider/Settings.java

+9 −0
Original line number Diff line number Diff line
@@ -18039,6 +18039,15 @@ public final class Settings { 
        public static final String REVIEW_PERMISSIONS_NOTIFICATION_STATE =

                "review_permissions_notification_state";













        /**













         * Whether repair mode is active on the device.













         * <p>













         * Set to 1 for true and 0 for false.













         *













         * @hide













         */













        public static final String REPAIR_MODE_ACTIVE = "repair_mode_active";



























        /**















         * 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








@@ -593,6 +593,7 @@ public class SettingsBackupTest {













                    Settings.Global.APPOP_HISTORY_BASE_INTERVAL_MILLIS,















                    Settings.Global.AUTO_REVOKE_PARAMETERS,















                    Settings.Global.ENABLE_RADIO_BUG_DETECTION,













                    Settings.Global.REPAIR_MODE_ACTIVE,















                    Settings.Global.RADIO_BUG_WAKELOCK_TIMEOUT_COUNT_THRESHOLD,















                    Settings.Global.RADIO_BUG_SYSTEM_ERROR_COUNT_THRESHOLD,















                    Settings.Global.ENABLED_SUBSCRIPTION_FOR_SLOT,