summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Christine Franks <christyfranks@google.com> 2017-06-27 22:09:27 +0000
committer android-build-merger <android-build-merger@google.com> 2017-06-27 22:09:27 +0000
commita1d9d3bfbb724d5c128e895be340efdbb0ecde04 (patch)
tree9a9fe5106f6e5cacdd1464a6c8e0444a0af8669c
parentd9ae80ee26135c0e3188e804925a4b72d0755c72 (diff)
parent02808bc7c94bf95feb5cd42647b73fab3ff741ce (diff)
Merge "Blacklist Night display settings for testing" into oc-dr1-dev am: 4608c69f23
am: 02808bc7c9 Change-Id: Ibaa6aa302992f1336ebf25e31d9102874eda72fa
-rw-r--r--core/tests/coretests/src/android/provider/SettingsBackupTest.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index 53ba9f7bcf66..1ebd42925b98 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -448,6 +448,8 @@ public class SettingsBackupTest {
Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH,
Settings.Secure.MULTI_PRESS_TIMEOUT,
Settings.Secure.NFC_PAYMENT_FOREGROUND,
+ Settings.Secure.NIGHT_DISPLAY_ACTIVATED,
+ Settings.Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME,
Settings.Secure.OVERVIEW_LAST_STACK_ACTIVE_TIME,
Settings.Secure.PACKAGE_VERIFIER_STATE,
Settings.Secure.PACKAGE_VERIFIER_USER_CONSENT,