diff options
| -rw-r--r-- | core/java/android/view/SurfaceControl.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index e9f10c190c0a..25f5609d9922 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -420,6 +420,9 @@ public final class SurfaceControl implements Parcelable { if (mNativeObject != 0) { release(); } + if (nativeObject != 0) { + mCloseGuard.open("release"); + } mNativeObject = nativeObject; } @@ -867,14 +870,12 @@ public final class SurfaceControl implements Parcelable { private SurfaceControl(Parcel in) { readFromParcel(in); - mCloseGuard.open("release"); } /** * @hide */ public SurfaceControl() { - mCloseGuard.open("release"); } public void readFromParcel(Parcel in) { @@ -972,8 +973,8 @@ public final class SurfaceControl implements Parcelable { if (mNativeObject != 0) { nativeRelease(mNativeObject); mNativeObject = 0; + mCloseGuard.close(); } - mCloseGuard.close(); } /** |