commit f450eb7ef05175e61fdb39ac3fff8d9ababa0257
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 23 18:01:04 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 23 18:01:04 2019 +0000
tree 562271987db7d5d6c1d08ad57d2001d66be8502b
parent 24d8a73d15c5d9d109f4d53f653470c400ea37aa
parent e9111e247c41bb9fcfada32e98f9bec4cdd6e8d6

Merge "Camera: Handle case where BatteryInfo intent not available" into qt-dev

tests/camera/src/android/hardware/camera2/cts/LogicalCameraDeviceTest.java

diff --git a/tests/camera/src/android/hardware/camera2/cts/LogicalCameraDeviceTest.java b/tests/camera/src/android/hardware/camera2/cts/LogicalCameraDeviceTest.java
index be932b7..750e715 100644
--- a/tests/camera/src/android/hardware/camera2/cts/LogicalCameraDeviceTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/LogicalCameraDeviceTest.java
@@ -1182,7 +1182,7 @@
     private boolean deviceHasBattery() {
         final Intent batteryInfo = mContext.registerReceiver(null,
                 new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
-        return batteryInfo.getBooleanExtra(BatteryManager.EXTRA_PRESENT, true);
+        return batteryInfo != null && batteryInfo.getBooleanExtra(BatteryManager.EXTRA_PRESENT, true);
     }
 
     private double getScreenSizeInInches() {