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

Merge "SurfaceControl: Bind close-guard lifetime to native-object lifetime." into rvc-dev

Browse Source
This commit is contained in:
Rob Carr
2020-03-02 20:40:17 +00:00
committed by Android (Google) Code Review
parent a132d3b5e2 01b0dd5f1d
commit 26351d7c4d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/view/SurfaceControl.java
View File

@@ -420,6 +420,9 @@ public final class SurfaceControl implements Parcelable {
if (mNativeObject != 0) { if (mNativeObject != 0) {
release(); release();
} }
if (nativeObject != 0) {
mCloseGuard.open("release");
}
mNativeObject = nativeObject; mNativeObject = nativeObject;
} }
@@ -867,14 +870,12 @@ public final class SurfaceControl implements Parcelable {
private SurfaceControl(Parcel in) { private SurfaceControl(Parcel in) {
readFromParcel(in); readFromParcel(in);
mCloseGuard.open("release");
} }
/** /**
* @hide * @hide
*/ */
public SurfaceControl() { public SurfaceControl() {
mCloseGuard.open("release");
} }
public void readFromParcel(Parcel in) { public void readFromParcel(Parcel in) {
@@ -972,9 +973,9 @@ public final class SurfaceControl implements Parcelable {
if (mNativeObject != 0) { if (mNativeObject != 0) {
nativeRelease(mNativeObject); nativeRelease(mNativeObject);
mNativeObject = 0; mNativeObject = 0;
}
mCloseGuard.close(); mCloseGuard.close();
} }
}
/** /**
* Disconnect any client still connected to the surface. * Disconnect any client still connected to the surface.