commit 59da2e1b4f6219bc309d3b9aa1d6b7e35edff672
author Aravind Akella <aakella@google.com> Mon Sep 14 16:07:42 2015 -0700
committer The Android Automerger <android-build@android.com> Fri Sep 18 11:44:22 2015 -0700
tree 778d0c867a1a873cc9bbafa328d0f1827622a0f0
parent 6774eb5a1c943e0de1f7d706d5e8b7de2c9e657c

Bug fix SignificantMotion test activity.

Do a null check on mScreenManipulator before trying to turn off the screen. It may be set to null
if there is no SMD sensor on the device.

Bug: 24055225
Change-Id: I71d8215f9b45318f501b15eafbccb3d5873d6402

apps/CtsVerifier/src/com/android/cts/verifier/sensors/SignificantMotionTestActivity.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/SignificantMotionTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/SignificantMotionTestActivity.java
index 6dbf8cc..2dfc7c8 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/SignificantMotionTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/SignificantMotionTestActivity.java
@@ -287,7 +287,9 @@
 
     @Override
     protected void activityCleanUp() {
-        mScreenManipulator.turnScreenOff();
+        if (mScreenManipulator != null) {
+            mScreenManipulator.turnScreenOff();
+        }
         LocalBroadcastManager.getInstance(this).unregisterReceiver(myBroadCastReceiver);
     }