From 315bc0971539f97aaf424c6b21b789a7c8ca9e04 Mon Sep 17 00:00:00 2001
From: Eino-Ville Talvala <etalvala@google.com>
Date: Fri, 21 Aug 2015 16:30:27 -0700
Subject: [PATCH] Camera2: Legacy: Lock down surface sizes before creating EGL
 surfaces

This ensures that sizes don't change after being initially inspected,
and/or stale size information isn't reused incorrectly.

Bug: 22092273
Change-Id: I5b26ea53977da4c1412e476d06d94aa791846393
---
 .../android/hardware/camera2/legacy/LegacyCameraDevice.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java b/core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java
index e786707c383df..fddfbde9844e8 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;