TestingCamera: add null check for supportedSceneModes
Camera.Parameters#getSupportedSceneModes() could return null, we need null
check before using it.
Bug: 21267188
Change-Id: Ic6ab784de07d85d5a640b61e7faee9c84c128416
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");
}
}