summaryrefslogtreecommitdiff
path: root/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
diff options
context:
space:
mode:
authorMatt Lee <matthewhlee@google.com>2022-06-12 23:19:47 +0000
committerMatt Lee <matthewhlee@google.com>2022-06-12 23:19:47 +0000
commit2ee3b28251c8f6864a6dbcd229b7a1641a4782e4 (patch)
tree3577b78cd7727ed3695b831753db86a62462ed7b /packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
parent64c414abd49acc8d488837ab90b51d822c23e66d (diff)
Revert "Merge s-mpr-2022-06"
Revert submission 732792 Reason for revert: build failure Reverted Changes: I3cbe7c924:Merge s-mpr-2022-06 I9881453ba:Don't set background color if TDA doesn't have a v... I57fa88c6f:Use TDA for background color instead of new color ... Ic2fa89b76:Dialing phone state should update active sub Change-Id: I9709841558bfcb325f7e205f5f5ec89c620d14dd
Diffstat (limited to 'packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java')
-rw-r--r--packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
index 9e1a3035a3a7..4a896e7f7042 100644
--- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
+++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
@@ -256,7 +256,6 @@ public class SettingsBackupTest {
Settings.Global.DROPBOX_RESERVE_PERCENT,
Settings.Global.DROPBOX_TAG_PREFIX,
Settings.Global.EMERGENCY_AFFORDANCE_NEEDED,
- Settings.Global.EMERGENCY_GESTURE_POWER_BUTTON_COOLDOWN_PERIOD_MS,
Settings.Global.EMULATE_DISPLAY_CUTOUT,
Settings.Global.ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED,
Settings.Global.ENABLE_CACHE_QUOTA_CALCULATION,