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 am: 62ccaabe3c

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

Change-Id: Icd7a26cdbb932339964811c88865cf1626e64112
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:46:37 +00:00
committed by Automerger Merge Worker
parent 1dc4a1e736 62ccaabe3c
commit 88799b1876
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
public void destroy() {
if (mNativeObject != 0) {
nativeDestroy(mNativeObject);
synchronized (mLock) {
if (mNativeObject != 0) {
nativeDestroy(mNativeObject);
}
release();
}
release();
}
/**