commit f99eba07c0d49e31e9a274fba6d10bc42fc2c942
author Eino-Ville Talvala <etalvala@google.com> Sat Aug 22 05:45:46 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Aug 22 05:45:46 2015 +0000
tree 0f1c02d291c5c819ced788fb335181247dbaea59
parent 7795faace682aee863d836da91364b2ea5632c8f
parent ec2efb9cac57f0cd6c371422114a37c5c9791ec8

am ec2efb9c: am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev

* commit 'ec2efb9cac57f0cd6c371422114a37c5c9791ec8':
  Camera2: Legacy: Lock down surface sizes before creating EGL surfaces

core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java

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 @@
                     } 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;