commit 0e1d0ecf51f1134183bbda5c2b3e8d727b4bcecd
author Rhed Jao <rhedjao@google.com> Thu Apr 27 04:10:48 2023 +0000
committer Eric Biggers <ebiggers@google.com> Tue Oct 10 23:01:45 2023 +0000
tree 5f40f537c86b4c9b9f93c5f81c5ebdfc2b891f5a
parent 2771887b5b2c5fb8d5f6765b82892dd685b4e60a

Add a settings key to expose the device's repair mode state

Bug: 277561275
Test: atest SettingsBackupTest
Change-Id: I35dd77bb99ca7e2eecc8439c2c61481c658c5052
Merged-In: I35dd77bb99ca7e2eecc8439c2c61481c658c5052
(cherry picked from commit 5af73f5f26fa7c724826a6d38d9ca0dbf05153f6)

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 9cdb9ce..bcd8c7d 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -17965,6 +17965,15 @@
                 "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

diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
index 873b434..57585e5 100644
--- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
+++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
@@ -590,6 +590,7 @@
                     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,