diff options
| author | 2022-09-09 18:15:32 +0000 | |
|---|---|---|
| committer | 2022-09-09 18:15:32 +0000 | |
| commit | 625d9387a50f55ce77cd0400112ccd27a86e785b (patch) | |
| tree | 9bea9704e57b66fadbfaf3c3b0e8b92edba09d12 | |
| parent | 417a10f9cfab7f531b42c25eabd449780e2bd707 (diff) | |
| parent | e7237b1cfbed23caebcbb73a3a7915b645d45640 (diff) | |
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>
| -rw-r--r-- | core/java/android/view/SurfaceView.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index 536a0ac6403b..05ff9f18af74 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -1626,8 +1626,11 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall */ @Override public void unlockCanvasAndPost(Canvas canvas) { - mSurface.unlockCanvasAndPost(canvas); - mSurfaceLock.unlock(); + try { + mSurface.unlockCanvasAndPost(canvas); + } finally { + mSurfaceLock.unlock(); + } } @Override |