summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2019-12-18 01:53:56 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2019-12-18 01:53:56 +0000
commit3b05bd784ea2029a46d03a47e6a61de1d79c1721 (patch)
tree40dedd52d893333a6e2dd1ae10c12f5c8aeeb20e
parent2f836303bbc92887c1231a2e5798d7acc53d0f69 (diff)
parentd4af97c5494f0989dd1b1f6b0d25bed56a690eae (diff)
DO NOT MERGE: Exclude nearby_sharing_component from backup test am: d4af97c549
Change-Id: I7229440f1cf986d6d37731373715a4a536462b4c
-rw-r--r--core/tests/coretests/src/android/provider/SettingsBackupTest.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index b7b02a3d61f1..874d99edc02a 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -732,6 +732,7 @@ public class SettingsBackupTest {
Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE,
Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE,
Settings.Secure.TAP_GESTURE,
+ Settings.Secure.NEARBY_SHARING_COMPONENT, // not user configurable
Settings.Secure.FACE_UNLOCK_RE_ENROLL);
@Test