commit 7500581c7125e33ab6db889498be8ade70816e93
author Netta Peterbursky <nettap@google.com> Tue Aug 01 00:53:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 01 00:53:30 2017 +0000
tree e41dd1b76144517c7612cf4d76dec55b9db4f6c0
parent fa7b264ff15825497df4029a829e5b5bf91cc600
parent 139cd243a8bd4a057abd756231383feec24abb43

Fix SettingsHelper by adding class to BySelector criteria of DND switch.
am: 139cd243a8

Change-Id: I72dd6980f462ed1dd47d7ea293622e1612634b56

libraries/system-helpers/settings-helper/src/android/system/helpers/SettingsHelper.java

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 f113a85..962e9e2 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 @@
         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 @@
             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);
             }