Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bb38b55 authored by Sheng-Hao Tsao's avatar Sheng-Hao Tsao Committed by android-build-merger
Browse files

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

am: e22ecbdd

Change-Id: I893e8346ce58b39f1e84a7e38af6a04f11f03800
parents c0faa604 e22ecbdd

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

+9 −0
Original line number Diff line number Diff line
@@ -504,6 +504,15 @@ public class RequestThreadManager { 
            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) {