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

Commit eab4a8b0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Looper: Add sysprop for verbose slow message logging" into main am: c5677bfc 

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



Change-Id: I376c577365768aaf7666727ecb5e797b8682b8fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 640ef561 c5677bfc

core/java/android/os/Looper.java

+18 −7
Original line number Diff line number Diff line
@@ -70,6 +70,13 @@ public final class Looper { 


    private static final String TAG = "Looper";



    private static class NoImagePreloadHolder {

        // Enable/Disable verbose logging with a system prop. e.g.

        // adb shell 'setprop log.looper.slow.verbose false && stop && start'

        private static final boolean sVerboseLogging =

                SystemProperties.getBoolean("log.looper.slow.verbose", false);

    }



    // sThreadLocal.get() will return null unless you've called prepare().

    @UnsupportedAppUsage

    static final ThreadLocal<Looper> sThreadLocal = new ThreadLocal<Looper>();
@@ -246,19 +253,23 @@ public final class Looper { 
            }

        }

        if (logSlowDelivery) {

            boolean slow = false;



            if (!me.mSlowDeliveryDetected || NoImagePreloadHolder.sVerboseLogging) {

                slow = showSlowLog(slowDeliveryThresholdMs, msg.when, dispatchStart,

                        "delivery", msg);

            }

            if (me.mSlowDeliveryDetected) {

                if ((dispatchStart - msg.when) <= 10) {

                if (!slow && (dispatchStart - msg.when) <= 10) {

                    Slog.w(TAG, "Drained");

                    me.mSlowDeliveryDetected = false;

                }

            } else {

                if (showSlowLog(slowDeliveryThresholdMs, msg.when, dispatchStart, "delivery",

                        msg)) {

                    // Once we write a slow delivery log, suppress until the queue drains.

            } else if (slow) {

                // A slow delivery is detected, suppressing further logs unless verbose logging

                // is enabled.

                me.mSlowDeliveryDetected = true;

            }

        }

        }

        if (logSlowDispatch) {

            showSlowLog(slowDispatchThresholdMs, dispatchStart, dispatchEnd, "dispatch", msg);

        }