commit ce48c21eae4352321467e6481ca6bf2e1d0010f9
author Bennie Ouyang <bennieo@google.com> Mon Nov 14 16:54:54 2016 -0800
committer gitbuildkicker <android-build@google.com> Tue Nov 15 13:26:05 2016 -0800
tree 88df1f30304390273b7f202165cdebb9d08690ec
parent 6d5b6de7e156f81c9d3f3fc316efe92a2bf0a2b4

Fix SysSettingTests

Test: make AndroidBvtTests -j40
Bug:32700150
Change-Id: Id95dbc58d30b2e8604d599ccbe66d96ee8358198
(cherry picked from commit c78b7d76da5db2a96419a96d87fa40563aea1f08)

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 cbbc3ff..d6ce448 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
@@ -511,14 +511,17 @@
                 TIMEOUT * 3).click();
         Thread.sleep(TIMEOUT * 3);
         flashLight = mDevice.wait(
-                Until.findObject(By.descContains(FLASHLIGHT)),
+                Until.findObject(By.desc(FLASHLIGHT)),
                 TIMEOUT * 3);
-        if (verifyOn) {
-            Assert.assertTrue(flashLight.getText().equals(lightOff));
-        } else {
-            Assert.assertTrue(flashLight.getText().equals(lightOn));
-            mDevice.wait(Until.findObject(By.textContains(FLASHLIGHT)),
-                    TIMEOUT * 3).click();
+        if (flashLight != null) {
+            String txt = flashLight.getText();
+            if (verifyOn) {
+                Assert.assertTrue(txt.equals(lightOff));
+            } else {
+                Assert.assertTrue(txt.equals(lightOn));
+                mDevice.wait(Until.findObject(By.textContains(FLASHLIGHT)),
+                        TIMEOUT * 3).click();
+            }
         }
         mDevice.pressHome();
         Thread.sleep(TIMEOUT * 3);