summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Rhed Jao <rhedjao@google.com> 2023-10-16 22:10:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-16 22:10:32 +0000
commit14cb34fa23e1523f2b2d67910c1d91aed5f6dc7f (patch)
tree08c4ed3413d15ae4d9114b20d52d17c6a4dc6432
parent4134bef195b9d56ea808080c40d9c1f4421f71a9 (diff)
parent0e1d0ecf51f1134183bbda5c2b3e8d727b4bcecd (diff)
Add a settings key to expose the device's repair mode state am: 0e1d0ecf51
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2781891 Change-Id: I73b5d699f1b741acf84d00318513c70d9835c58f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/provider/Settings.java9
-rw-r--r--packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java1
2 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 9cdb9cefdc43..bcd8c7df196f 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -17965,6 +17965,15 @@ public final class Settings {
"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
*/
diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
index 873b434aa4fd..57585e55def0 100644
--- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
+++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
@@ -590,6 +590,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,