Merge "SurfaceControl: Bind close-guard lifetime to native-object lifetime."... (21b42239) · Commits · e / os / android_frameworks_base

core/java/android/view/SurfaceControl.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -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,9 +973,9 @@ public final class SurfaceControl implements Parcelable {
		if (mNativeObject != 0) {
		nativeRelease(mNativeObject);
		mNativeObject = 0;
		}
		mCloseGuard.close();
		}
		}

		/**
		* Disconnect any client still connected to the surface.