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 am: 3868362584

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18674393

Change-Id: I06bf0bf2733ad61f123f182f7af3754b54d5f999
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chavi Weingarten
2022-06-01 17:09:38 +00:00
committed by Automerger Merge Worker
parent b32e99291f 3868362584
commit 9eb9c476f3
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
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;
mSurfaceLock.lock();
try {
mSurface.destroy(); mSurface.destroy();
} finally {
mSurfaceLock.unlock();
}
synchronized (mSurfaceControlLock) { synchronized (mSurfaceControlLock) {
if (mBlastBufferQueue != null) { if (mBlastBufferQueue != null) {
mBlastBufferQueue.destroy(); mBlastBufferQueue.destroy();