diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-08-22 05:38:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-22 05:38:01 +0000 |
| commit | ec2efb9cac57f0cd6c371422114a37c5c9791ec8 (patch) | |
| tree | 5f8efbb7a6691c870441fb2d1c3a74bce8c6ec7b /core/java/android | |
| parent | 4351111bbb8b64ff8a89be549c0a503d487b1a78 (diff) | |
| parent | 08b12dfba630659601972f0d857b6580fdae4313 (diff) | |
| download | frameworks_base-ec2efb9cac57f0cd6c371422114a37c5c9791ec8.zip frameworks_base-ec2efb9cac57f0cd6c371422114a37c5c9791ec8.tar.gz frameworks_base-ec2efb9cac57f0cd6c371422114a37c5c9791ec8.tar.bz2 | |
am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
* commit '08b12dfba630659601972f0d857b6580fdae4313':
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java b/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java index e786707..fddfbde 100644 --- a/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java +++ b/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java @@ -338,6 +338,8 @@ public class LegacyCameraDevice implements AutoCloseable { } else { sizedSurfaces.add(new Pair<>(output, s)); } + // Lock down the size before configuration + setSurfaceDimens(output, s.getWidth(), s.getHeight()); } catch (BufferQueueAbandonedException e) { Log.e(TAG, "Surface bufferqueue is abandoned, cannot configure as output: ", e); return BAD_VALUE; |