diff options
author | Zhijun He <zhijunhe@google.com> | 2015-05-19 18:10:32 -0700 |
---|---|---|
committer | Zhijun He <zhijunhe@google.com> | 2015-05-19 18:13:47 -0700 |
commit | 58712cc85667a30dbdaf8fffc3c05b7e62486a22 (patch) | |
tree | 04a3cf2b4b8c8c82ea7deea1fdd018fcd45278b7 | |
parent | 1134f70e714f227487581dc06aa4fb7bf931a6c2 (diff) | |
download | pdk-58712cc85667a30dbdaf8fffc3c05b7e62486a22.tar.gz |
TestingCamera: add null check for supportedSceneModesandroid-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r4android-6.0.0_r3android-6.0.0_r2android-6.0.0_r1marshmallow-releasemarshmallow-devmarshmallow-cts-release
Camera.Parameters#getSupportedSceneModes() could return null, we need null
check before using it.
Bug: 21267188
Change-Id: Ic6ab784de07d85d5a640b61e7faee9c84c128416
-rw-r--r-- | apps/TestingCamera/src/com/android/testingcamera/TestingCamera.java | 14 |
1 files changed, 9 insertions, 5 deletions
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 @@ public class TestingCamera extends Activity 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"); } } |