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

Commit b74567dd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Dump controller for AppWindowToken" into oc-dev

parents 343cf6e9 9c64cb6a

services/core/java/com/android/server/am/ActivityRecord.java

+3 −3
Original line number Diff line number Diff line
@@ -423,11 +423,11 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo 
                                pw.print("\"");

                        pw.print(" primaryColor=");

                        pw.println(Integer.toHexString(taskDescription.getPrimaryColor()));

                        pw.print(" backgroundColor=");

                        pw.print(prefix + " backgroundColor=");

                        pw.println(Integer.toHexString(taskDescription.getBackgroundColor()));

                        pw.print(" statusBarColor=");

                        pw.print(prefix + " statusBarColor=");

                        pw.println(Integer.toHexString(taskDescription.getStatusBarColor()));

                        pw.print(" navigationBarColor=");

                        pw.print(prefix + " navigationBarColor=");

                        pw.println(Integer.toHexString(taskDescription.getNavigationBarColor()));

            }

            if (iconFilename == null && taskDescription.getIcon() != null) {

services/core/java/com/android/server/wm/AppWindowContainerController.java

+5 −1
Original line number Diff line number Diff line
@@ -715,6 +715,10 @@ public class AppWindowContainerController 


    @Override

    public String toString() {

        return "{AppWindowContainerController token=" + mToken + "}";

        return "AppWindowContainerController{"

                + " token=" + mToken

                + " mContainer=" + mContainer

                + " mListener=" + mListener

                + "}";

    }

}

services/core/java/com/android/server/wm/AppWindowToken.java

+3 −0
Original line number Diff line number Diff line
@@ -1550,6 +1550,9 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
        if (mPendingRelaunchCount != 0) {

            pw.print(prefix); pw.print("mPendingRelaunchCount="); pw.println(mPendingRelaunchCount);

        }

        if (getController() != null) {

            pw.print(prefix); pw.print("controller="); pw.println(getController());

        }

    }



    @Override