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

Commit 7c58fa6e authored by Alison Cichowlas's avatar Alison Cichowlas Committed by Automerger Merge Worker
Browse files

Merge "Log Volume visibility at INFO temporarily, to collect better data on... 

Merge "Log Volume visibility at INFO temporarily, to collect better data on why it is sometimes not dismissed." into tm-qpr-dev am: 18e7ac67 am: 82075c23

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



Change-Id: Ia725fe7f2c379a6b3767f708fbf9cb236102675b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f79fc676 82075c23

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+6 −6
Original line number Diff line number Diff line
@@ -1404,7 +1404,7 @@ public class VolumeDialogImpl implements VolumeDialog, 


    private void showH(int reason, boolean keyguardLocked, int lockTaskModeState) {

        Trace.beginSection("VolumeDialogImpl#showH");

        if (D.BUG) Log.d(TAG, "showH r=" + Events.SHOW_REASONS[reason]);

        Log.i(TAG, "showH r=" + Events.SHOW_REASONS[reason]);

        mHandler.removeMessages(H.SHOW);

        mHandler.removeMessages(H.DISMISS);

        rescheduleTimeoutH();
@@ -1432,7 +1432,7 @@ public class VolumeDialogImpl implements VolumeDialog, 
        final int timeout = computeTimeoutH();

        mHandler.sendMessageDelayed(mHandler

                .obtainMessage(H.DISMISS, Events.DISMISS_REASON_TIMEOUT, 0), timeout);

        if (D.BUG) Log.d(TAG, "rescheduleTimeout " + timeout + " " + Debug.getCaller());

        Log.i(TAG, "rescheduleTimeout " + timeout + " " + Debug.getCaller());

        mController.userActivity();

    }
@@ -1459,10 +1459,10 @@ public class VolumeDialogImpl implements VolumeDialog, 


    protected void dismissH(int reason) {

        Trace.beginSection("VolumeDialogImpl#dismissH");

        if (D.BUG) {

            Log.d(TAG, "mDialog.dismiss() reason: " + Events.DISMISS_REASONS[reason]



        Log.i(TAG, "mDialog.dismiss() reason: " + Events.DISMISS_REASONS[reason]

                + " from: " + Debug.getCaller());

        }



        mHandler.removeMessages(H.DISMISS);

        mHandler.removeMessages(H.SHOW);

        if (mIsAnimatingDismiss) {