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

Commit 9b6bc695 authored by Daniel Kim's avatar Daniel Kim Committed by Android (Google) Code Review
Browse files

Merge "Revert "DCL is broken and should not be used.""

parents a42087ae 11822c79

config/preloaded-classes-denylist

+0 −1
Original line number Diff line number Diff line
@@ -9,4 +9,3 @@ android.net.rtp.AudioGroup 
android.net.rtp.AudioStream

android.net.rtp.RtpStream

java.util.concurrent.ThreadLocalRandom
 
com.android.internal.jank.InteractionJankMonitor$InstanceHolder

core/java/com/android/internal/jank/InteractionJankMonitor.java

+10 −5
Original line number Diff line number Diff line
@@ -292,10 +292,7 @@ public class InteractionJankMonitor { 
            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_CLEAR_ALL,

    };



    private static class InstanceHolder {

        public static final InteractionJankMonitor INSTANCE =

            new InteractionJankMonitor(new HandlerThread(DEFAULT_WORKER_NAME));

    }

    private static volatile InteractionJankMonitor sInstance;



    private final DeviceConfig.OnPropertiesChangedListener mPropertiesChangedListener =

            this::updateProperties;
@@ -387,7 +384,15 @@ public class InteractionJankMonitor { 
     * @return instance of InteractionJankMonitor

     */

    public static InteractionJankMonitor getInstance() {

        return InstanceHolder.INSTANCE;

        // Use DCL here since this method might be invoked very often.

        if (sInstance == null) {

            synchronized (InteractionJankMonitor.class) {

                if (sInstance == null) {

                    sInstance = new InteractionJankMonitor(new HandlerThread(DEFAULT_WORKER_NAME));

                }

            }

        }

        return sInstance;

    }



    /**