diff options
| author | Sol Boucher <solb@google.com> | 2014-08-15 18:44:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-15 04:37:53 +0000 |
| commit | 3d6e5018ff8d64ac1815477fe0172f62f91727a2 (patch) | |
| tree | b3ba49854f540bc529b3b610f025686ee9666ce5 /camera2/portability/src/com/android/ex | |
| parent | c6344faeff899655abd60b3bf4cd638e58bcc3d7 (diff) | |
| parent | bc9c0e2cb071b085ecc5646751fb59f5145d51b1 (diff) | |
| download | android_frameworks_ex-3d6e5018ff8d64ac1815477fe0172f62f91727a2.tar.gz android_frameworks_ex-3d6e5018ff8d64ac1815477fe0172f62f91727a2.tar.bz2 android_frameworks_ex-3d6e5018ff8d64ac1815477fe0172f62f91727a2.zip | |
Merge "camera2-portability: Improve capability conversions' null-safety" into lmp-dev
Diffstat (limited to 'camera2/portability/src/com/android/ex')
| -rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java index 288ded7..efa68e8 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java @@ -84,13 +84,21 @@ public class AndroidCamera2Settings extends CameraSettings { // TODO: mCurrentZoomIndex mExposureCompensationIndex = queryTemplateDefaultOrMakeOneUp(CONTROL_AE_EXPOSURE_COMPENSATION, 0); + mCurrentFlashMode = flashModeFromRequest(); - mCurrentFocusMode = AndroidCamera2Capabilities.focusModeFromInt( - mTemplateSettings.get(CONTROL_AF_MODE)); - mCurrentSceneMode = AndroidCamera2Capabilities.sceneModeFromInt( - mTemplateSettings.get(CONTROL_SCENE_MODE)); - mWhiteBalance = AndroidCamera2Capabilities.whiteBalanceFromInt( - mTemplateSettings.get(CONTROL_AWB_MODE)); + Integer currentFocusMode = mTemplateSettings.get(CONTROL_AF_MODE); + if (currentFocusMode != null) { + mCurrentFocusMode = AndroidCamera2Capabilities.focusModeFromInt(currentFocusMode); + } + Integer currentSceneMode = mTemplateSettings.get(CONTROL_SCENE_MODE); + if (currentSceneMode != null) { + mCurrentSceneMode = AndroidCamera2Capabilities.sceneModeFromInt(currentSceneMode); + } + Integer whiteBalance = mTemplateSettings.get(CONTROL_AWB_MODE); + if (whiteBalance != null) { + mWhiteBalance = AndroidCamera2Capabilities.whiteBalanceFromInt(whiteBalance); + } + mVideoStabilizationEnabled = queryTemplateDefaultOrMakeOneUp( CONTROL_VIDEO_STABILIZATION_MODE, CONTROL_VIDEO_STABILIZATION_MODE_OFF) == CONTROL_VIDEO_STABILIZATION_MODE_ON; |