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

Commit c832de6b authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Replace DumpUtils.withIndenting() with DumpUtils.asIndenting() 

I was noticing places where having both `pw` and `ipw` was causing bugs, and this new convention is much less likely to cause errors, plus is more efficient.

Test: manual dumping
Change-Id: I5caba0a31aa7793667695d03fa39277935871ba3
parent 61a74673

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+29 −27
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import android.service.notification.StatusBarNotification; 
import android.util.ArraySet;

import android.util.AttributeSet;

import android.util.FloatProperty;

import android.util.IndentingPrintWriter;

import android.util.Log;

import android.util.MathUtils;

import android.util.Pair;
@@ -3431,46 +3432,47 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    }



    @Override

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

    public void dump(FileDescriptor fd, PrintWriter pwOriginal, String[] args) {

        IndentingPrintWriter pw = DumpUtilsKt.asIndenting(pwOriginal);

        // Skip super call; dump viewState ourselves

        pw.println("Notification: " + mEntry.getKey());

        DumpUtilsKt.withIndenting(pw, ipw -> {

            ipw.print("visibility: " + getVisibility());

            ipw.print(", alpha: " + getAlpha());

            ipw.print(", translation: " + getTranslation());

            ipw.print(", removed: " + isRemoved());

            ipw.print(", expandAnimationRunning: " + mExpandAnimationRunning);

        DumpUtilsKt.withIncreasedIndent(pw, () -> {

            pw.print("visibility: " + getVisibility());

            pw.print(", alpha: " + getAlpha());

            pw.print(", translation: " + getTranslation());

            pw.print(", removed: " + isRemoved());

            pw.print(", expandAnimationRunning: " + mExpandAnimationRunning);

            NotificationContentView showingLayout = getShowingLayout();

            ipw.print(", privateShowing: " + (showingLayout == mPrivateLayout));

            ipw.println();

            showingLayout.dump(fd, ipw, args);

            pw.print(", privateShowing: " + (showingLayout == mPrivateLayout));

            pw.println();

            showingLayout.dump(fd, pw, args);



            if (getViewState() != null) {

                getViewState().dump(fd, ipw, args);

                ipw.println();

                getViewState().dump(fd, pw, args);

                pw.println();

            } else {

                ipw.println("no viewState!!!");

                pw.println("no viewState!!!");

            }



            if (mIsSummaryWithChildren) {

                ipw.println();

                ipw.print("ChildrenContainer");

                ipw.print(" visibility: " + mChildrenContainer.getVisibility());

                ipw.print(", alpha: " + mChildrenContainer.getAlpha());

                ipw.print(", translationY: " + mChildrenContainer.getTranslationY());

                ipw.println();

                pw.println();

                pw.print("ChildrenContainer");

                pw.print(" visibility: " + mChildrenContainer.getVisibility());

                pw.print(", alpha: " + mChildrenContainer.getAlpha());

                pw.print(", translationY: " + mChildrenContainer.getTranslationY());

                pw.println();

                List<ExpandableNotificationRow> notificationChildren = getAttachedChildren();

                ipw.println("Children: " + notificationChildren.size());

                ipw.print("{");

                ipw.increaseIndent();

                pw.println("Children: " + notificationChildren.size());

                pw.print("{");

                pw.increaseIndent();

                for (ExpandableNotificationRow child : notificationChildren) {

                    ipw.println();

                    child.dump(fd, ipw, args);

                    pw.println();

                    child.dump(fd, pw, args);

                }

                ipw.decreaseIndent();

                ipw.println("}");

                pw.decreaseIndent();

                pw.println("}");

            } else if (mPrivateLayout != null) {

                mPrivateLayout.dumpSmartReplies(ipw);

                mPrivateLayout.dumpSmartReplies(pw);

            }

        });

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java

+7 −5
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.res.Configuration; 
import android.graphics.Paint;

import android.graphics.Rect;

import android.util.AttributeSet;

import android.util.IndentingPrintWriter;

import android.view.View;

import android.view.ViewGroup;

import android.widget.FrameLayout;
@@ -743,15 +744,16 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable { 
    }



    @Override

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

    public void dump(FileDescriptor fd, PrintWriter pwOriginal, String[] args) {

        IndentingPrintWriter pw = DumpUtilsKt.asIndenting(pwOriginal);

        pw.println(getClass().getSimpleName());

        DumpUtilsKt.withIndenting(pw, ipw -> {

        DumpUtilsKt.withIncreasedIndent(pw, () -> {

            ExpandableViewState viewState = getViewState();

            if (viewState == null) {

                ipw.println("no viewState!!!");

                pw.println("no viewState!!!");

            } else {

                viewState.dump(fd, ipw, args);

                ipw.println();

                viewState.dump(fd, pw, args);

                pw.println();

            }

        });

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/FooterView.java

+8 −6
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Context; 
import android.content.res.Configuration;

import android.content.res.Resources;

import android.util.AttributeSet;

import android.util.IndentingPrintWriter;

import android.view.View;



import com.android.systemui.R;
@@ -49,14 +50,15 @@ public class FooterView extends StackScrollerDecorView { 
    }



    @Override

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

    public void dump(FileDescriptor fd, PrintWriter pwOriginal, String[] args) {

        IndentingPrintWriter pw = DumpUtilsKt.asIndenting(pwOriginal);

        super.dump(fd, pw, args);

        DumpUtilsKt.withIndenting(pw, ipw -> {

            ipw.println("visibility: " + DumpUtilsKt.visibilityString(getVisibility()));

            ipw.println("manageButton showHistory: " + mShowHistory);

            ipw.println("manageButton visibility: "

        DumpUtilsKt.withIncreasedIndent(pw, () -> {

            pw.println("visibility: " + DumpUtilsKt.visibilityString(getVisibility()));

            pw.println("manageButton showHistory: " + mShowHistory);

            pw.println("manageButton visibility: "

                    + DumpUtilsKt.visibilityString(mDismissButton.getVisibility()));

            ipw.println("dismissButton visibility: "

            pw.println("dismissButton visibility: "

                    + DumpUtilsKt.visibilityString(mDismissButton.getVisibility()));

        });

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+8 −6
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import android.os.SystemProperties; 
import android.os.UserHandle;

import android.provider.Settings;

import android.util.AttributeSet;

import android.util.IndentingPrintWriter;

import android.util.Log;

import android.util.MathUtils;

import android.util.Pair;
@@ -4901,7 +4902,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
    }



    @ShadeViewRefactor(RefactorComponent.SHADE_VIEW)

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

    public void dump(FileDescriptor fd, PrintWriter pwOriginal, String[] args) {

        IndentingPrintWriter pw = DumpUtilsKt.asIndenting(pwOriginal);

        StringBuilder sb = new StringBuilder("[")

                .append(this.getClass().getSimpleName()).append(":")

                .append(" pulsing=").append(mPulsing ? "T" : "f")
@@ -4915,15 +4917,15 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
                .append(" hideAmount=").append(mAmbientState.getHideAmount())

                .append("]");

        pw.println(sb.toString());

        DumpUtilsKt.withIndenting(pw, ipw -> {

        DumpUtilsKt.withIncreasedIndent(pw, () -> {

            int childCount = getChildCount();

            ipw.println("Number of children: " + childCount);

            ipw.println();

            pw.println("Number of children: " + childCount);

            pw.println();



            for (int i = 0; i < childCount; i++) {

                ExpandableView child = (ExpandableView) getChildAt(i);

                child.dump(fd, ipw, args);

                ipw.println();

                child.dump(fd, pw, args);

                pw.println();

            }

            int transientViewCount = getTransientViewCount();

            pw.println("Transient Views: " + transientViewCount);

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+9 −9
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ import android.text.TextUtils; 
import android.util.ArraySet;

import android.util.DisplayMetrics;

import android.util.EventLog;

import android.util.IndentingPrintWriter;

import android.util.Log;

import android.util.MathUtils;

import android.util.Slog;
@@ -2315,7 +2316,8 @@ public class StatusBar extends CoreStartable implements 
    }



    @Override

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

    public void dump(FileDescriptor fd, PrintWriter pwOriginal, String[] args) {

        IndentingPrintWriter pw = DumpUtilsKt.asIndenting(pwOriginal);

        synchronized (mQueueLock) {

            pw.println("Current Status Bar state:");

            pw.println("  mExpandedVisible=" + mExpandedVisible);
@@ -2356,14 +2358,12 @@ public class StatusBar extends CoreStartable implements 
        }

        pw.println("  mStackScroller: ");

        if (mStackScroller != null) {

            DumpUtilsKt.withIndenting(pw, ipw -> {

                // Triple indent until we rewrite the rest of this dump()

                ipw.increaseIndent();

                ipw.increaseIndent();

                mStackScroller.dump(fd, ipw, args);

                ipw.decreaseIndent();

                ipw.decreaseIndent();

            });

            // Double indent until we rewrite the rest of this dump()

            pw.increaseIndent();

            pw.increaseIndent();

            mStackScroller.dump(fd, pw, args);

            pw.decreaseIndent();

            pw.decreaseIndent();

        }

        pw.println("  Theme:");

        String nightMode = mUiModeManager == null ? "null" : mUiModeManager.getNightMode() + "";