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

Commit 96985e52 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Remove FileDescriptor from systemui.Dumpable. 

This is the first step in moving over to the new public
android.util.Dumpable api.

Bug: 217567642
Test: m SystemUI
Merged-In: Ibaebcfb2c6c5326d0c45b8c72d868c76655d89a0
Change-Id: Ibaebcfb2c6c5326d0c45b8c72d868c76655d89a0
parent 17c1c80c

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/Bubble.java

+2 −4
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import android.util.Log; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.InstanceId;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.List;

import java.util.Objects;
@@ -808,8 +807,7 @@ public class Bubble implements BubbleViewProvider { 
    /**

     * Description of current bubble state.

     */

    public void dump(

            @NonNull FileDescriptor fd, @NonNull PrintWriter pw, @NonNull String[] args) {

    public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {

        pw.print("key: "); pw.println(mKey);

        pw.print("  showInShade:   "); pw.println(showInShade());

        pw.print("  showDot:       "); pw.println(showDot());
@@ -819,7 +817,7 @@ public class Bubble implements BubbleViewProvider { 
        pw.print("  suppressNotif: "); pw.println(shouldSuppressNotification());

        pw.print("  autoExpand:    "); pw.println(shouldAutoExpand());

        if (mExpandedView != null) {

            mExpandedView.dump(fd, pw, args);

            mExpandedView.dump(pw, args);

        }

    }

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+5 −6
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ import com.android.wm.shell.onehanded.OneHandedController; 
import com.android.wm.shell.onehanded.OneHandedTransitionCallback;

import com.android.wm.shell.pip.PinnedStackListenerForwarder;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.HashMap;
@@ -1424,12 +1423,12 @@ public class BubbleController { 
    /**

     * Description of current bubble state.

     */

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

    private void dump(PrintWriter pw, String[] args) {

        pw.println("BubbleController state:");

        mBubbleData.dump(fd, pw, args);

        mBubbleData.dump(pw, args);

        pw.println();

        if (mStackView != null) {

            mStackView.dump(fd, pw, args);

            mStackView.dump(pw, args);

        }

        pw.println();

    }
@@ -1790,10 +1789,10 @@ public class BubbleController { 
        }



        @Override

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

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

            try {

                mMainExecutor.executeBlocking(() -> {

                    BubbleController.this.dump(fd, pw, args);

                    BubbleController.this.dump(pw, args);

                    mCachedState.dump(pw);

                });

            } catch (InterruptedException e) {

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java

+3 −4
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import com.android.internal.util.FrameworkStatsLog; 
import com.android.wm.shell.R;

import com.android.wm.shell.bubbles.Bubbles.DismissReason;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Collections;
@@ -1080,7 +1079,7 @@ public class BubbleData { 
    /**

     * Description of current bubble data state.

     */

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

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

        pw.print("selected: ");

        pw.println(mSelectedBubble != null

                ? mSelectedBubble.getKey()
@@ -1091,13 +1090,13 @@ public class BubbleData { 
        pw.print("stack bubble count:    ");

        pw.println(mBubbles.size());

        for (Bubble bubble : mBubbles) {

            bubble.dump(fd, pw, args);

            bubble.dump(pw, args);

        }



        pw.print("overflow bubble count:    ");

        pw.println(mOverflowBubbles.size());

        for (Bubble bubble : mOverflowBubbles) {

            bubble.dump(fd, pw, args);

            bubble.dump(pw, args);

        }



        pw.print("summaryKeys: ");

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java

+1 −3
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ import com.android.wm.shell.TaskView; 
import com.android.wm.shell.common.AlphaOptimizedButton;

import com.android.wm.shell.common.TriangleShape;



import java.io.FileDescriptor;

import java.io.PrintWriter;



/**
@@ -776,8 +775,7 @@ public class BubbleExpandedView extends LinearLayout { 
    /**

     * Description of current expanded view state.

     */

    public void dump(

            @NonNull FileDescriptor fd, @NonNull PrintWriter pw, @NonNull String[] args) {

    public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {

        pw.print("BubbleExpandedView");

        pw.print("  taskId:               "); pw.println(mTaskId);

        pw.print("  stackView:            "); pw.println(mStackView);

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java

+3 −4
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ import com.android.wm.shell.common.FloatingContentCoordinator; 
import com.android.wm.shell.common.ShellExecutor;

import com.android.wm.shell.common.magnetictarget.MagnetizedObject;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.math.BigDecimal;

import java.math.RoundingMode;
@@ -278,7 +277,7 @@ public class BubbleStackView extends FrameLayout 
    private int mPointerIndexDown = -1;



    /** Description of current animation controller state. */

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

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

        pw.println("Stack view state:");



        String bubblesOnScreen = BubbleDebugConfig.formatBubblesString(
@@ -292,8 +291,8 @@ public class BubbleStackView extends FrameLayout 
        pw.print("  expandedContainerMatrix: ");

        pw.println(mExpandedViewContainer.getAnimationMatrix());



        mStackAnimationController.dump(fd, pw, args);

        mExpandedAnimationController.dump(fd, pw, args);

        mStackAnimationController.dump(pw, args);

        mExpandedAnimationController.dump(pw, args);



        if (mExpandedBubble != null) {

            pw.println("Expanded bubble state:");