commit 0fb0a81bd3f7955b696e8058a18b7c702378baef
author Bennie Ouyang <bennieo@google.com> Tue Jan 31 15:13:24 2017 -0800
committer gitbuildkicker <android-build@google.com> Wed Feb 01 17:56:08 2017 -0800
tree 550f4b19cc27cbe7344bd9f3a376992e385f8ea5
parent 6c92d1e7b2480b0ecb717d38176fce40cee6a21a

Fix ABVT setting test for product ui change

Test: make AndroidBvtTests
Bug: 34600915
Change-Id: I004b5eeeec16706b14961d0ee4cfb1eaa7d1e711
(cherry picked from commit b3d3c498cbd9e2ad72ffe49e613423de7799cf99)

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 99b6145..e2ffd51 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
@@ -478,7 +478,7 @@
             int onSetting = Settings.Global.getInt(mResolver, ZEN_MODE);
             launchQuickSettingsAndWait();
             mDevice.wait(Until.findObject(By.descContains(DND)),
-                    TIMEOUT * 3).click();
+                    TIMEOUT * 3).getChildren().get(0).click();
             Thread.sleep(TIMEOUT * 3);
             int changedSetting = Settings.Global.getInt(mResolver, ZEN_MODE);
             Assert.assertFalse(onSetting == changedSetting);
@@ -489,9 +489,8 @@
             int setting = Settings.Global.getInt(mResolver, ZEN_MODE);
             if (setting > 0) {
                 launchQuickSettingsAndWait();
-                ;
                 mDevice.wait(Until.findObject(By.descContains(DND)),
-                        TIMEOUT * 3).click();
+                        TIMEOUT * 3).getChildren().get(0).click();
                 Thread.sleep(TIMEOUT * 3);
             }
         }