diff options
author | Angus Kong <shkong@google.com> | 2014-06-13 13:55:54 -0700 |
---|---|---|
committer | Ed Heyl <edheyl@google.com> | 2014-06-18 10:24:46 -0700 |
commit | f07afbbde040b9578bc7f188016c3960e8616ab0 (patch) | |
tree | 8967f3384f1cbbbb28b1c210f03ff86435424602 /camera2/portability/src | |
parent | 8097973089420749dcd1ab4974a629c2466b31cc (diff) | |
download | android_frameworks_ex-f07afbbde040b9578bc7f188016c3960e8616ab0.tar.gz android_frameworks_ex-f07afbbde040b9578bc7f188016c3960e8616ab0.tar.bz2 android_frameworks_ex-f07afbbde040b9578bc7f188016c3960e8616ab0.zip |
Don't pass empty list of areas.
Some devices won't work well if we pass in an empty list of focusing or metering
areas.
Change-Id: Iff6bfd37a7d551b12c43e88cf8d4934472837257
Diffstat (limited to 'camera2/portability/src')
-rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java index a352278..a2266a6 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraManagerImpl.java @@ -527,16 +527,23 @@ class AndroidCameraManagerImpl implements CameraManager { mParamsToSet.setAutoWhiteBalanceLock(settings.isAutoWhiteBalanceLocked()); } if (mCapabilities.supports(CameraCapabilities.Feature.FOCUS_AREA)) { - mParamsToSet.setFocusAreas(settings.getFocusAreas()); + if (settings.getFocusAreas().size() != 0) { + mParamsToSet.setFocusAreas(settings.getFocusAreas()); + } } if (mCapabilities.supports(CameraCapabilities.Feature.METERING_AREA)) { - mParamsToSet.setMeteringAreas(settings.getMeteringAreas()); + if (settings.getMeteringAreas().size() != 0) { + mParamsToSet.setMeteringAreas(settings.getMeteringAreas()); + } } if (settings.getCurrentFlashMode() != CameraCapabilities.FlashMode.NO_FLASH) { mParamsToSet.setFlashMode(stringifier.stringify(settings.getCurrentFlashMode())); } if (settings.getCurrentSceneMode() != CameraCapabilities.SceneMode.NO_SCENE_MODE) { - mParamsToSet.setSceneMode(stringifier.stringify(settings.getCurrentSceneMode())); + if (settings.getCurrentSceneMode() != null) { + mParamsToSet + .setSceneMode(stringifier.stringify(settings.getCurrentSceneMode())); + } } CameraSettings.GpsData gpsData = settings.getGpsData(); |