diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-09-22 03:11:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-22 03:11:59 +0000 |
| commit | d93fb94eecfa4e4f0bb90df4b8122b2411d1d8c1 (patch) | |
| tree | ddcf4b7b974b6a895911997d334273c14e2252de | |
| parent | 5d3a3f0ea658af0afbb7944b4866d403ba5f4538 (diff) | |
| parent | e96362419ad35c6d6ea9196a164a6cfce366b7ac (diff) | |
| download | frameworks_base-d93fb94eecfa4e4f0bb90df4b8122b2411d1d8c1.zip frameworks_base-d93fb94eecfa4e4f0bb90df4b8122b2411d1d8c1.tar.gz frameworks_base-d93fb94eecfa4e4f0bb90df4b8122b2411d1d8c1.tar.bz2 | |
am 39db0506: am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev
* commit '39db05065cd619fef0aa26051f2b8fc4bf72d1eb':
camera2: Avoid setting null metering regions in LEGACY.
camera2: Fix JPEG orientation set by LEGACY request.
| -rw-r--r-- | core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java b/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java index 7c6475d..72d2d81 100644 --- a/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java +++ b/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java @@ -399,8 +399,9 @@ public class LegacyRequestMapper { // jpeg.orientation { - int orientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION); - params.setRotation(ParamsUtils.getOrDefault(request, JPEG_ORIENTATION, orientation)); + Integer orientation = request.get(CaptureRequest.JPEG_ORIENTATION); + params.setRotation(ParamsUtils.getOrDefault(request, JPEG_ORIENTATION, + (orientation == null) ? 0 : orientation)); } // jpeg.quality @@ -496,6 +497,11 @@ public class LegacyRequestMapper { } } + if (meteringRectangleList.size() == 0) { + Log.w(TAG, "Only received metering rectangles with weight 0."); + return Arrays.asList(ParameterUtils.CAMERA_AREA_DEFAULT); + } + // Ignore any regions beyond our maximum supported count int countMeteringAreas = Math.min(maxNumMeteringAreas, meteringRectangleList.size()); |