Merge "make sure mSurfaceLock.unlock can be executed in unlockCanvasAndPost" am: dcef1fb28a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2206140 Change-Id: I73321fa03fd047030ebb09af73a59d34aec51600 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user