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

Commit f40b84db authored by Vishnu Nair's avatar Vishnu Nair Committed by Automerger Merge Worker
Browse files

Merge "SurfaceView: Revert SurfaceLock locking changes" into tm-qpr-dev am: 5b518a2a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19602637



Change-Id: I48929e3415143d5aa25178fd1b5870feee5b635b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 264eb6b3 5b518a2a

core/java/android/view/SurfaceView.java

+103 −106
Original line number Diff line number Diff line
@@ -724,9 +724,9 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 


    private void releaseSurfaces(boolean releaseSurfacePackage) {

        mSurfaceAlpha = 1f;

        mSurface.destroy();



        synchronized (mSurfaceControlLock) {

            mSurface.destroy();

            if (mBlastBufferQueue != null) {

                mBlastBufferQueue.destroy();

                mBlastBufferQueue = null;
@@ -775,6 +775,8 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
            Transaction surfaceUpdateTransaction) {

        boolean realSizeChanged = false;



        mSurfaceLock.lock();

        try {

            mDrawingStopped = !mVisible;



            if (DEBUG) Log.i(TAG, System.identityHashCode(this) + " "
@@ -814,6 +816,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
                setBufferSize(surfaceUpdateTransaction);

            }

            if (sizeChanged || creating || !isHardwareAccelerated()) {



                // Set a window crop when creating the surface or changing its size to

                // crop the buffer to the surface size since the buffer producer may

                // use SCALING_MODE_SCALE and submit a larger size than the surface
@@ -851,6 +854,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
            }

            applyTransactionOnVriDraw(surfaceUpdateTransaction);

            updateEmbeddedAccessibilityMatrix(false);



            mSurfaceFrame.left = 0;

            mSurfaceFrame.top = 0;

            if (translator == null) {
@@ -867,7 +871,9 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
                    || mLastSurfaceHeight != surfaceHeight;

            mLastSurfaceWidth = surfaceWidth;

            mLastSurfaceHeight = surfaceHeight;



        } finally {

            mSurfaceLock.unlock();

        }

        return realSizeChanged;

    }
@@ -1133,30 +1139,21 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
     *                          Surface for compatibility reasons.

     */

    private void copySurface(boolean surfaceControlCreated, boolean bufferSizeChanged) {

        if (surfaceControlCreated) {

            mSurface.copyFrom(mBlastBufferQueue);

        }



        if (bufferSizeChanged && getContext().getApplicationInfo().targetSdkVersion

                < Build.VERSION_CODES.O) {

            // Some legacy applications use the underlying native {@link Surface} object

            // as a key to whether anything has changed. In these cases, updates to the

            // existing {@link Surface} will be ignored when the size changes.

            // Therefore, we must explicitly recreate the {@link Surface} in these

            // cases.

        boolean needsWorkaround = bufferSizeChanged &&

            getContext().getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.O;

       if (!surfaceControlCreated && !needsWorkaround) {

           return;

       }

       mSurfaceLock.lock();

       try {

           if (surfaceControlCreated) {

               mSurface.copyFrom(mBlastBufferQueue);

           }



           if (needsWorkaround) {

            if (mBlastBufferQueue != null) {

                mSurface.transferFrom(mBlastBufferQueue.createSurfaceWithHandle());

            }

        }

       } finally {

           mSurfaceLock.unlock();

       }

    }



    private void setBufferSize(Transaction transaction) {