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

Commit a1e5845b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "make sure mSurfaceLock.unlock can be executed in unlockCanvasAndPost"... 

Merge "make sure mSurfaceLock.unlock can be executed in unlockCanvasAndPost" am: dcef1fb2 am: e7237b1c am: 625d9387

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



Change-Id: I2c34b28bcb51ae30c9f2781293ace27253b6481d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4315a6f2 625d9387

core/java/android/view/SurfaceView.java

+5 −2
Original line number Diff line number Diff line
@@ -1626,9 +1626,12 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
         */

        @Override

        public void unlockCanvasAndPost(Canvas canvas) {

            try {

                mSurface.unlockCanvasAndPost(canvas);

            } finally {

                mSurfaceLock.unlock();

            }

        }



        @Override

        public Surface getSurface() {