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

Merge "Lock in Surface#destroy" into tm-dev am: 1559113427

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

Change-Id: I6d3c713b74465a15dd15a14b10ca3d3fd32ed79b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chavi Weingarten
2022-05-11 21:15:33 +00:00
committed by Automerger Merge Worker
parent a4bbecf53c 1559113427
commit 62ccaabe3c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/view/Surface.java
View File

@@ -341,10 +341,12 @@ public class Surface implements Parcelable {
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage
public void destroy() { public void destroy() {
if (mNativeObject != 0) { synchronized (mLock) {
nativeDestroy(mNativeObject); if (mNativeObject != 0) {
nativeDestroy(mNativeObject);
}
release();
} }
release();
} }
/** /**