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

Merge "Remove CloseGuard from DisplayEventReceiver" into sc-dev

Browse Source
This commit is contained in:
John Reck
2021-04-13 19:50:53 +00:00
committed by Android (Google) Code Review
parent 211bf19cca 7db8da8a1e
commit 9f7e44d30d
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/view/DisplayEventReceiver.java
View File

@@ -26,7 +26,6 @@ import android.util.Log;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import dalvik.annotation.optimization.FastNative; import dalvik.annotation.optimization.FastNative;
import dalvik.system.CloseGuard;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
@@ -73,8 +72,6 @@ public abstract class DisplayEventReceiver {
private static final String TAG = "DisplayEventReceiver"; private static final String TAG = "DisplayEventReceiver";
private final CloseGuard mCloseGuard = CloseGuard.get();
@UnsupportedAppUsage @UnsupportedAppUsage
private long mReceiverPtr; private long mReceiverPtr;
@@ -114,8 +111,6 @@ public abstract class DisplayEventReceiver {
mMessageQueue = looper.getQueue(); mMessageQueue = looper.getQueue();
mReceiverPtr = nativeInit(new WeakReference<DisplayEventReceiver>(this), mMessageQueue, mReceiverPtr = nativeInit(new WeakReference<DisplayEventReceiver>(this), mMessageQueue,
vsyncSource, eventRegistration); vsyncSource, eventRegistration);
mCloseGuard.open("dispose");
} }
@Override @Override
@@ -135,13 +130,6 @@ public abstract class DisplayEventReceiver {
} }
private void dispose(boolean finalized) { private void dispose(boolean finalized) {
if (mCloseGuard != null) {
if (finalized) {
mCloseGuard.warnIfOpen();
}
mCloseGuard.close();
}
if (mReceiverPtr != 0) { if (mReceiverPtr != 0) {
nativeDispose(mReceiverPtr); nativeDispose(mReceiverPtr);
mReceiverPtr = 0; mReceiverPtr = 0;