summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNetta Peterbursky <nettap@google.com>2017-08-01 00:53:30 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-01 00:53:30 +0000
commit780903ec4a01a9b26ef081a014c59c3c40073286 (patch)
tree023849ca244f02fcf2a4e7e828ed8221c18762b8
parent8caed7c61a535748f9b85d8441f78b8f958cab24 (diff)
parent139cd243a8bd4a057abd756231383feec24abb43 (diff)
downloadplatform_testing-780903ec4a01a9b26ef081a014c59c3c40073286.tar.gz
Fix SettingsHelper by adding class to BySelector criteria of DND switch.
am: 139cd243a8 Change-Id: I95594c1730775982c0baeb16e4854a9a1d22128f
-rw-r--r--libraries/system-helpers/settings-helper/src/android/system/helpers/SettingsHelper.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/libraries/system-helpers/settings-helper/src/android/system/helpers/SettingsHelper.java b/libraries/system-helpers/settings-helper/src/android/system/helpers/SettingsHelper.java
index f113a8507..962e9e270 100644
--- a/libraries/system-helpers/settings-helper/src/android/system/helpers/SettingsHelper.java
+++ b/libraries/system-helpers/settings-helper/src/android/system/helpers/SettingsHelper.java
@@ -515,7 +515,7 @@ public class SettingsHelper {
try {
int onSetting = Settings.Global.getInt(mResolver, ZEN_MODE);
launchQuickSettingsAndWait();
- mDevice.wait(Until.findObject(By.descContains(DND)),
+ mDevice.wait(Until.findObject(By.descContains(DND).clazz(Switch.class)),
TIMEOUT * 3).getChildren().get(0).click();
Thread.sleep(TIMEOUT * 3);
int changedSetting = Settings.Global.getInt(mResolver, ZEN_MODE);
@@ -527,7 +527,7 @@ public class SettingsHelper {
int setting = Settings.Global.getInt(mResolver, ZEN_MODE);
if (setting > 0) {
launchQuickSettingsAndWait();
- mDevice.wait(Until.findObject(By.descContains(DND)),
+ mDevice.wait(Until.findObject(By.descContains(DND).clazz(Switch.class)),
TIMEOUT * 3).getChildren().get(0).click();
Thread.sleep(TIMEOUT * 3);
}