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

Commit 41795133 authored by Shai Barack's avatar Shai Barack Committed by Android (Google) Code Review
Browse files

Merge "Revert "Don't fall back to legacy MessageQueue when Instrumenting"" into main

parents 9287c8c5 af846352

core/java/android/os/CombinedMessageQueue/MessageQueue.java

+10 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ public final class MessageQueue { 


    MessageQueue(boolean quitAllowed) {

        initIsProcessAllowedToUseConcurrent();

        mUseConcurrent = sIsProcessAllowedToUseConcurrent;

        mUseConcurrent = sIsProcessAllowedToUseConcurrent && !isInstrumenting();

        mQuitAllowed = quitAllowed;

        mPtr = nativeInit();

        mThread = Thread.currentThread();
@@ -202,6 +202,15 @@ public final class MessageQueue { 
        return;

    }



    private static boolean isInstrumenting() {

        final ActivityThread activityThread = ActivityThread.currentActivityThread();

        if (activityThread == null) {

            return false;

        }

        final Instrumentation instrumentation = activityThread.getInstrumentation();

        return instrumentation != null && instrumentation.isInstrumenting();

    }



    @Override

    protected void finalize() throws Throwable {

        try {