Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a8b27b8 authored by John Reck's avatar John Reck Committed by Automerger Merge Worker
Browse files

Merge "Remove CloseGuard from DisplayEventReceiver" into sc-dev am: 9f7e44d3 

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

Change-Id: Ifcff1ec6c7d8ea3c36135861414bcc8b87504093
parents 4fc301aa 9f7e44d3

core/java/android/view/DisplayEventReceiver.java

+0 −12
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.util.Log; 
import com.android.internal.annotations.VisibleForTesting;



import dalvik.annotation.optimization.FastNative;

import dalvik.system.CloseGuard;



import java.lang.ref.WeakReference;
@@ -73,8 +72,6 @@ public abstract class DisplayEventReceiver { 


    private static final String TAG = "DisplayEventReceiver";



    private final CloseGuard mCloseGuard = CloseGuard.get();



    @UnsupportedAppUsage

    private long mReceiverPtr;
@@ -114,8 +111,6 @@ public abstract class DisplayEventReceiver { 
        mMessageQueue = looper.getQueue();

        mReceiverPtr = nativeInit(new WeakReference<DisplayEventReceiver>(this), mMessageQueue,

                vsyncSource, eventRegistration);



        mCloseGuard.open("dispose");

    }



    @Override
@@ -135,13 +130,6 @@ public abstract class DisplayEventReceiver { 
    }



    private void dispose(boolean finalized) {

        if (mCloseGuard != null) {

            if (finalized) {

                mCloseGuard.warnIfOpen();

            }

            mCloseGuard.close();

        }



        if (mReceiverPtr != 0) {

            nativeDispose(mReceiverPtr);

            mReceiverPtr = 0;