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

Commit e7237b1c 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" am: dcef1fb2 

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



Change-Id: I73321fa03fd047030ebb09af73a59d34aec51600
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5a664a3a dcef1fb2

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() {