diff options
| author | Andy Huibers <andyhuibers@google.com> | 2014-08-28 12:32:07 -0700 |
|---|---|---|
| committer | Andy Huibers <andyhuibers@google.com> | 2014-08-28 12:32:07 -0700 |
| commit | f73c6cf2f04451ba4517abccd36a114667c69ae3 (patch) | |
| tree | 4b34f2044c989c9bf2e23d5370a16b5bb03fe91a /camera2 | |
| parent | 415cf3ee18640ad0799e5c9a738afd1d19c14883 (diff) | |
| download | android_frameworks_ex-f73c6cf2f04451ba4517abccd36a114667c69ae3.tar.gz android_frameworks_ex-f73c6cf2f04451ba4517abccd36a114667c69ae3.tar.bz2 android_frameworks_ex-f73c6cf2f04451ba4517abccd36a114667c69ae3.zip | |
Add ability to reset focus and metering regions using API1.
Bug: 17286539
Change-Id: Id75bfc594f9fb6a08bb187d053ae99a85e7d9d42
Diffstat (limited to 'camera2')
| -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) { |