Add null check in AndroidCameraSettings.

Check Camera.Parameters is null in AndroidCameraSettings ctor.
This should also fix the NPE bug b/17620440.

Bug: 17555612
Change-Id: Iee5f41b5d47eced3155e31c09f267eaa61c7de39

1 files changed, 8 insertions, 0 deletions

diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java
index ee69b54..4558fe3 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java
@@ -17,15 +17,23 @@
 package com.android.ex.camera2.portability;
 
 import android.hardware.Camera;
+import com.android.ex.camera2.portability.debug.Log;
 
 /**
  * The subclass of {@link CameraSettings} for Android Camera 1 API.
  */
 public class AndroidCameraSettings extends CameraSettings {
+    private static final Log.Tag TAG = new Log.Tag("AndCamSet");
+
     private static final String TRUE = "true";
     private static final String RECORDING_HINT = "recording-hint";
 
     public AndroidCameraSettings(CameraCapabilities capabilities, Camera.Parameters params) {
+        if (params == null) {
+            Log.w(TAG, "Settings ctor requires a non-null Camera.Parameters.");
+            return;
+        }
+
         CameraCapabilities.Stringifier stringifier = capabilities.getStringifier();
 
         setSizesLocked(false);