diff options
author | Senpo Hu <senpo@google.com> | 2014-09-24 22:04:36 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-24 22:04:36 +0000 |
commit | 21e5d2401d605b31bccd6357da4ee7c49cf08aed (patch) | |
tree | 2752d93fa130489d1011a01042c8b5e1d99bd9a7 /camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java | |
parent | 0ea96753473345ed5aa5ac97da03f632bda8cf59 (diff) | |
parent | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 (diff) | |
download | android_frameworks_ex-21e5d2401d605b31bccd6357da4ee7c49cf08aed.tar.gz android_frameworks_ex-21e5d2401d605b31bccd6357da4ee7c49cf08aed.tar.bz2 android_frameworks_ex-21e5d2401d605b31bccd6357da4ee7c49cf08aed.zip |
am 70a82d9d: Add null check in AndroidCameraSettings.
* commit '70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0':
Add null check in AndroidCameraSettings.
Diffstat (limited to 'camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java')
-rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java | 8 |
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); |