diff options
| author | Andy Huibers <andyhuibers@google.com> | 2014-08-29 19:07:25 (GMT) |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-29 19:07:25 (GMT) |
| commit | 5537c7c145c8be2289772910eb4a60b43de8c30f (patch) | |
| tree | 4b34f2044c989c9bf2e23d5370a16b5bb03fe91a | |
| parent | 25c45cca5f0ee247554d26a3376096ed5c8ec010 (diff) | |
| parent | f73c6cf2f04451ba4517abccd36a114667c69ae3 (diff) | |
| download | android_frameworks_ex-5537c7c145c8be2289772910eb4a60b43de8c30f.zip android_frameworks_ex-5537c7c145c8be2289772910eb4a60b43de8c30f.tar.gz android_frameworks_ex-5537c7c145c8be2289772910eb4a60b43de8c30f.tar.bz2 | |
am f73c6cf2: Add ability to reset focus and metering regions using API1.
* commit 'f73c6cf2f04451ba4517abccd36a114667c69ae3':
Add ability to reset focus and metering regions using API1.
| -rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java index f8a2e38..41ad971 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java @@ -612,11 +612,15 @@ class AndroidCameraAgentImpl extends CameraAgent { if (mCapabilities.supports(CameraCapabilities.Feature.FOCUS_AREA)) { if (settings.getFocusAreas().size() != 0) { parameters.setFocusAreas(settings.getFocusAreas()); + } else { + parameters.setFocusAreas(null); } } if (mCapabilities.supports(CameraCapabilities.Feature.METERING_AREA)) { if (settings.getMeteringAreas().size() != 0) { parameters.setMeteringAreas(settings.getMeteringAreas()); + } else { + parameters.setMeteringAreas(null); } } if (settings.getCurrentFlashMode() != CameraCapabilities.FlashMode.NO_FLASH) { |