Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove lock when calling Surface.destroy" into tm-dev

Browse Source
This commit is contained in:
Chavi Weingarten
2022-06-01 16:36:34 +00:00
committed by Android (Google) Code Review
parent d72491683d 9e3cd0533f
commit 3868362584
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/view/SurfaceView.java
View File

@@ -719,13 +719,8 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
private void releaseSurfaces(boolean releaseSurfacePackage) { private void releaseSurfaces(boolean releaseSurfacePackage) {
mSurfaceAlpha = 1f; mSurfaceAlpha = 1f;
mSurface.destroy();
mSurfaceLock.lock();
try {
mSurface.destroy();
} finally {
mSurfaceLock.unlock();
}
synchronized (mSurfaceControlLock) { synchronized (mSurfaceControlLock) {
if (mBlastBufferQueue != null) { if (mBlastBufferQueue != null) {
mBlastBufferQueue.destroy(); mBlastBufferQueue.destroy();