commit 58712cc85667a30dbdaf8fffc3c05b7e62486a22
author Zhijun He <zhijunhe@google.com> Tue May 19 18:10:32 2015 -0700
committer Zhijun He <zhijunhe@google.com> Tue May 19 18:13:47 2015 -0700
tree 04a3cf2b4b8c8c82ea7deea1fdd018fcd45278b7
parent 1134f70e714f227487581dc06aa4fb7bf931a6c2

TestingCamera: add null check for supportedSceneModes

Camera.Parameters#getSupportedSceneModes() could return null, we need null
check before using it.

Bug: 21267188
Change-Id: Ic6ab784de07d85d5a640b61e7faee9c84c128416

apps/TestingCamera/src/com/android/testingcamera/TestingCamera.java

diff --git a/apps/TestingCamera/src/com/android/testingcamera/TestingCamera.java b/apps/TestingCamera/src/com/android/testingcamera/TestingCamera.java
index 8b9dd4f..d743443 100644
--- a/apps/TestingCamera/src/com/android/testingcamera/TestingCamera.java
+++ b/apps/TestingCamera/src/com/android/testingcamera/TestingCamera.java
@@ -1005,14 +1005,18 @@
 
         setCameraDisplayOrientation();
         mParams = mCamera.getParameters();
+        mHDRToggle.setEnabled(false);
         if (mParams != null) {
             List<String> sceneModes = mParams.getSupportedSceneModes();
-            for (String mode : sceneModes) {
-                if (Camera.Parameters.SCENE_MODE_HDR.equals(mode)){
-                    mHDRToggle.setEnabled(true);
-                } else {
-                    mHDRToggle.setEnabled(false);
+            if (sceneModes != null) {
+                for (String mode : sceneModes) {
+                    if (Camera.Parameters.SCENE_MODE_HDR.equals(mode)){
+                        mHDRToggle.setEnabled(true);
+                        break;
+                    }
                 }
+            } else {
+                Log.i(TAG, "Supported scene modes is null");
             }
         }