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
This commit is contained in:
Eino-Ville Talvala
2015-08-22 05:45:46 +00:00
committed by Android Git Automerger

View File

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