Merge "make sure mSurfaceLock.unlock can be executed in unlockCanvasAndPost" am: dcef1fb28a am: e7237b1cfb

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

Change-Id: Ife38acfc66c9d1bd026609c745a8bba6df3b4fc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-09-09 18:15:32 +00:00
committed by Automerger Merge Worker

View File

@@ -1626,8 +1626,11 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
*/ */
@Override @Override
public void unlockCanvasAndPost(Canvas canvas) { public void unlockCanvasAndPost(Canvas canvas) {
mSurface.unlockCanvasAndPost(canvas); try {
mSurfaceLock.unlock(); mSurface.unlockCanvasAndPost(canvas);
} finally {
mSurfaceLock.unlock();
}
} }
@Override @Override