commit 8bb38b555b781b9722bebedef3e9a7359ebef526
author Sheng-Hao Tsao <shenghao@google.com> Fri Aug 11 23:26:07 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 11 23:26:07 2017 +0000
tree 2667bc3bf0a4d07e909de5d2d91c0e0e97d583e2
parent c0faa604dbbd2bf90f16d1fba4c515a9bfe1fc04
parent e22ecbdd61a0ca4f8f5fa1829d80f67351a1af17

Merge "Fix a bug that SurfaceView loses transformation" into oc-mr1-dev
am: e22ecbdd61

Change-Id: I893e8346ce58b39f1e84a7e38af6a04f11f03800

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

diff --git a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
index da62f54..e8f34cc 100644
--- a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
+++ b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
@@ -504,6 +504,15 @@
             previews.add(new Pair<>(p, previewSizeIter.next()));
         }
         mGLThreadManager.setConfigurationAndWait(previews, mCaptureCollector);
+
+        for (Surface p : mPreviewOutputs) {
+            try {
+                LegacyCameraDevice.setSurfaceOrientation(p, facing, orientation);
+            } catch (LegacyExceptionUtils.BufferQueueAbandonedException e) {
+                Log.e(TAG, "Surface abandoned, skipping setSurfaceOrientation()", e);
+            }
+        }
+
         mGLThreadManager.allowNewFrames();
         mPreviewTexture = mGLThreadManager.getCurrentSurfaceTexture();
         if (mPreviewTexture != null) {