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

Commit 7b773f93 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Remove lock when calling Surface.destroy" into tm-dev am: 38683625 

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



Change-Id: If7c12e28ac447444cb28638dc14840cd2811a6ee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7f78ee58 38683625

core/java/android/view/SurfaceView.java

+2 −7
Original line number Diff line number Diff line
@@ -719,13 +719,8 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 


    private void releaseSurfaces(boolean releaseSurfacePackage) {

        mSurfaceAlpha = 1f;

	

        mSurfaceLock.lock();

        try {

        mSurface.destroy();

        } finally {

            mSurfaceLock.unlock();

        }



        synchronized (mSurfaceControlLock) {

            if (mBlastBufferQueue != null) {

                mBlastBufferQueue.destroy();