Merge "Revert "Add logs that indicate why a surface is invalid"" into rvc-dev (d8208009) · Commits · e / os / android_frameworks_base

core/java/android/view/SurfaceControl.java

+2 −24

Original line number	Diff line number	Diff line
		@@ -230,7 +230,6 @@ public final class SurfaceControl implements Parcelable {
		*/
		public long mNativeObject;
		private long mNativeHandle;
		private Throwable mReleaseStack = null;

		// TODO: Move this to native.
		private final Object mSizeLock = new Object();
		@@ -442,13 +441,6 @@ public final class SurfaceControl implements Parcelable {
		}
		mNativeObject = nativeObject;
		mNativeHandle = mNativeObject != 0 ? nativeGetHandle(nativeObject) : 0;
		if (mNativeObject == 0) {
		if (Build.IS_DEBUGGABLE) {
		mReleaseStack = new Throwable("assigned zero nativeObject here");
		}
		} else {
		mReleaseStack = null;
		}
		}

		/**
		@@ -1024,21 +1016,10 @@ public final class SurfaceControl implements Parcelable {
		nativeRelease(mNativeObject);
		mNativeObject = 0;
		mNativeHandle = 0;
		if (Build.IS_DEBUGGABLE) {
		mReleaseStack = new Throwable("released here");
		}
		mCloseGuard.close();
		}
		}

		/**
		* Returns the call stack that assigned mNativeObject to zero.
		* @hide
		*/
		public Throwable getReleaseStack() {
		return mReleaseStack;
		}

		/**
		* Disconnect any client still connected to the surface.
		* @hide
		@@ -1050,11 +1031,8 @@ public final class SurfaceControl implements Parcelable {
		}

		private void checkNotReleased() {
		if (mNativeObject == 0) {
		Log.wtf(TAG, "Invalid " + this + " caused by:", mReleaseStack);
		throw new NullPointerException(
		"mNativeObject of " + this + " is null. Have you called release() already?");
		}
		if (mNativeObject == 0) throw new NullPointerException(
		"Invalid " + this + ", mNativeObject is null. Have you called release() already?");
		}

		/**