diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-09-22 03:02:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-22 03:02:42 +0000 |
| commit | e96362419ad35c6d6ea9196a164a6cfce366b7ac (patch) | |
| tree | f0383fc9695b1ba86610038404b9055c3484cb49 | |
| parent | 58e3dc2f930226c18a54b38695dc209b7ce8ea46 (diff) | |
| parent | ee3ef2b8af94b118a91b2f7c454260d191153f7a (diff) | |
| download | frameworks_base-e96362419ad35c6d6ea9196a164a6cfce366b7ac.zip frameworks_base-e96362419ad35c6d6ea9196a164a6cfce366b7ac.tar.gz frameworks_base-e96362419ad35c6d6ea9196a164a6cfce366b7ac.tar.bz2 | |
am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev
* commit '3b57d98a1a84ce063cb3681cae10795216300035':
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()); |