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

Merge "Revert "Add logs that indicate why a surface is invalid"" into rvc-dev am: d82080094e am: 0b235515ce am: 3d61c943b8

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

Change-Id: I7911d3ebd066ad9b0647bdd626545330f5ae8d66
This commit is contained in:
TreeHugger Robot
2020-06-17 14:45:40 +00:00
committed by Automerger Merge Worker
parent 5ba867dc68 3d61c943b8
commit 4d3b81c34b
1 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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?");
}
/**