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

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

Merge "Refine WindowInsets logs" into sc-v2-dev

parents 0bacfbaa 6902904e

core/java/android/view/InsetsSourceControl.java

+9 −0
Original line number Diff line number Diff line
@@ -185,6 +185,15 @@ public class InsetsSourceControl implements Parcelable { 
        return result;

    }



    @Override

    public String toString() {

        return "InsetsSourceControl: {"

                + "type=" + InsetsState.typeToString(mType)

                + ", mSurfacePosition=" + mSurfacePosition

                + ", mInsetsHint=" + mInsetsHint

                + "}";

    }



    public void dump(String prefix, PrintWriter pw) {

        pw.print(prefix);

        pw.print("InsetsSourceControl type="); pw.print(InsetsState.typeToString(mType));

core/java/com/android/internal/protolog/ProtoLogGroup.java

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ public enum ProtoLogGroup implements IProtoLogGroup { 
            Consts.TAG_WM),

    WM_DEBUG_WINDOW_TRANSITIONS(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,

            Consts.TAG_WM),

    WM_DEBUG_WINDOW_INSETS(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    TEST_GROUP(true, true, false, "WindowManagerProtoLogTest");



    private final boolean mEnabled;

data/etc/services.core.protolog.json

+45 −42
Original line number Diff line number Diff line
@@ -571,6 +571,12 @@ 
      "group": "WM_DEBUG_CONFIGURATION",

      "at": "com\/android\/server\/wm\/ActivityStarter.java"

    },

    "-1483435730": {

      "message": "InsetsSource setWin %s for type %s",

      "level": "DEBUG",

      "group": "WM_DEBUG_WINDOW_INSETS",

      "at": "com\/android\/server\/wm\/InsetsSourceProvider.java"

    },

    "-1480772131": {

      "message": "No app or window is requesting an orientation, return %d for display id=%d",

      "level": "VERBOSE",
@@ -673,6 +679,12 @@ 
      "group": "WM_DEBUG_IME",

      "at": "com\/android\/server\/wm\/ImeInsetsSourceProvider.java"

    },

    "-1394745488": {

      "message": "ControlAdapter onAnimationCancelled mSource: %s mControlTarget: %s",

      "level": "INFO",

      "group": "WM_DEBUG_WINDOW_INSETS",

      "at": "com\/android\/server\/wm\/InsetsSourceProvider.java"

    },

    "-1391944764": {

      "message": "SURFACE DESTROY: %s. %s",

      "level": "INFO",
@@ -721,12 +733,6 @@ 
      "group": "WM_DEBUG_STARTING_WINDOW",

      "at": "com\/android\/server\/wm\/ActivityRecord.java"

    },

    "-1312861660": {

      "message": "notifyInsetsControlChanged for %s ",

      "level": "DEBUG",

      "group": "WM_DEBUG_IME",

      "at": "com\/android\/server\/wm\/WindowState.java"

    },

    "-1311436264": {

      "message": "Unregister task fragment organizer=%s uid=%d pid=%d",

      "level": "VERBOSE",
@@ -835,6 +841,12 @@ 
      "group": "WM_DEBUG_STATES",

      "at": "com\/android\/server\/wm\/TaskFragment.java"

    },

    "-1185473319": {

      "message": "ControlAdapter startAnimation mSource: %s controlTarget: %s",

      "level": "INFO",

      "group": "WM_DEBUG_WINDOW_INSETS",

      "at": "com\/android\/server\/wm\/InsetsSourceProvider.java"

    },

    "-1176488860": {

      "message": "SURFACE isSecure=%b: %s",

      "level": "INFO",
@@ -1531,12 +1543,6 @@ 
      "group": "WM_DEBUG_TASKS",

      "at": "com\/android\/server\/wm\/RootWindowContainer.java"

    },

    "-395922585": {

      "message": "InsetsSource setWin %s",

      "level": "DEBUG",

      "group": "WM_DEBUG_IME",

      "at": "com\/android\/server\/wm\/InsetsSourceProvider.java"

    },

    "-393505149": {

      "message": "unable to update pointer icon",

      "level": "WARN",
@@ -1741,12 +1747,6 @@ 
      "group": "WM_DEBUG_SCREEN_ON",

      "at": "com\/android\/server\/wm\/WindowManagerService.java"

    },

    "-112805366": {

      "message": "InsetsSource updateVisibility serverVisible: %s clientVisible: %s",

      "level": "DEBUG",

      "group": "WM_DEBUG_IME",

      "at": "com\/android\/server\/wm\/InsetsSourceProvider.java"

    },

    "-108977760": {

      "message": "Sandbox max bounds for uid %s to bounds %s. config to never sandbox = %s, config to always sandbox = %s, letterboxing from mismatch with parent bounds = %s, has mCompatDisplayInsets = %s, should create compatDisplayInsets = %s",

      "level": "DEBUG",
@@ -1849,12 +1849,6 @@ 
      "group": "WM_DEBUG_RECENTS_ANIMATIONS",

      "at": "com\/android\/server\/wm\/RecentsAnimationController.java"

    },

    "29780972": {

      "message": "InsetsSource Control %s for target %s",

      "level": "DEBUG",

      "group": "WM_DEBUG_IME",

      "at": "com\/android\/server\/wm\/InsetsSourceProvider.java"

    },

    "35398067": {

      "message": "goodToGo(): onAnimationStart, transit=%s, apps=%d, wallpapers=%d, nonApps=%d",

      "level": "DEBUG",
@@ -1897,24 +1891,12 @@ 
      "group": "WM_DEBUG_TASKS",

      "at": "com\/android\/server\/wm\/RootWindowContainer.java"

    },

    "73987756": {

      "message": "ControlAdapter onAnimationCancelled mSource: %s mControlTarget: %s",

      "level": "INFO",

      "group": "WM_DEBUG_IME",

      "at": "com\/android\/server\/wm\/InsetsSourceProvider.java"

    },

    "74885950": {

      "message": "Waiting for top state to be released by %s",

      "level": "VERBOSE",

      "group": "WM_DEBUG_STATES",

      "at": "com\/android\/server\/wm\/ActivityTaskSupervisor.java"

    },

    "75707221": {

      "message": "ControlAdapter startAnimation mSource: %s controlTarget: %s",

      "level": "INFO",

      "group": "WM_DEBUG_IME",

      "at": "com\/android\/server\/wm\/InsetsSourceProvider.java"

    },

    "83950285": {

      "message": "removeAnimation(%d)",

      "level": "DEBUG",
@@ -2287,6 +2269,12 @@ 
      "group": "WM_SHOW_SURFACE_ALLOC",

      "at": "com\/android\/server\/wm\/RootWindowContainer.java"

    },

    "416924848": {

      "message": "InsetsSource Control %s for target %s",

      "level": "DEBUG",

      "group": "WM_DEBUG_WINDOW_INSETS",

      "at": "com\/android\/server\/wm\/InsetsSourceProvider.java"

    },

    "417311568": {

      "message": "onResize: Resizing %s",

      "level": "DEBUG",
@@ -2803,6 +2791,12 @@ 
      "group": "WM_DEBUG_STATES",

      "at": "com\/android\/server\/wm\/ActivityRecord.java"

    },

    "1030898920": {

      "message": "notifyInsetsControlChanged for %s ",

      "level": "DEBUG",

      "group": "WM_DEBUG_WINDOW_INSETS",

      "at": "com\/android\/server\/wm\/WindowState.java"

    },

    "1033274509": {

      "message": "moveWindowTokenToDisplay: Attempted to move non-existing token: %s",

      "level": "WARN",
@@ -2821,6 +2815,12 @@ 
      "group": "WM_ERROR",

      "at": "com\/android\/server\/wm\/WindowManagerService.java"

    },

    "1047505501": {

      "message": "notifyInsetsChanged for %s ",

      "level": "DEBUG",

      "group": "WM_DEBUG_WINDOW_INSETS",

      "at": "com\/android\/server\/wm\/WindowState.java"

    },

    "1047769218": {

      "message": "Finishing activity r=%s, result=%d, data=%s, reason=%s",

      "level": "VERBOSE",
@@ -3211,12 +3211,6 @@ 
      "group": "WM_DEBUG_APP_TRANSITIONS",

      "at": "com\/android\/server\/wm\/ActivityRecord.java"

    },

    "1533154777": {

      "message": "notifyInsetsChanged for %s ",

      "level": "DEBUG",

      "group": "WM_DEBUG_IME",

      "at": "com\/android\/server\/wm\/WindowState.java"

    },

    "1557732761": {

      "message": "For Intent %s bringing to top: %s",

      "level": "DEBUG",
@@ -3643,6 +3637,12 @@ 
      "group": "WM_ERROR",

      "at": "com\/android\/server\/wm\/WindowManagerService.java"

    },

    "2070726247": {

      "message": "InsetsSource updateVisibility for %s, serverVisible: %s clientVisible: %s",

      "level": "DEBUG",

      "group": "WM_DEBUG_WINDOW_INSETS",

      "at": "com\/android\/server\/wm\/InsetsSourceProvider.java"

    },

    "2083556954": {

      "message": "Set mOrientationChanging of %s",

      "level": "VERBOSE",
@@ -3768,6 +3768,9 @@ 
    "WM_DEBUG_TASKS": {

      "tag": "WindowManager"

    },

    "WM_DEBUG_WINDOW_INSETS": {

      "tag": "WindowManager"

    },

    "WM_DEBUG_WINDOW_MOVEMENT": {

      "tag": "WindowManager"

    },

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

+9 −7
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import static android.view.InsetsState.ITYPE_IME; 
import static android.view.InsetsState.ITYPE_NAVIGATION_BAR;

import static android.view.InsetsState.ITYPE_STATUS_BAR;



import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_IME;

import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_WINDOW_INSETS;

import static com.android.server.wm.InsetsSourceProviderProto.CAPTURED_LEASH;

import static com.android.server.wm.InsetsSourceProviderProto.CLIENT_VISIBLE;

import static com.android.server.wm.InsetsSourceProviderProto.CONTROL;
@@ -164,7 +164,8 @@ class InsetsSourceProvider { 
            mWin.cancelAnimation();

            mWin.mProvidedInsetsSources.remove(mSource.getType());

        }

        ProtoLog.d(WM_DEBUG_IME, "InsetsSource setWin %s", win);

        ProtoLog.d(WM_DEBUG_WINDOW_INSETS, "InsetsSource setWin %s for type %s", win,

                InsetsState.typeToString(mSource.getType()));

        mWin = win;

        mFrameProvider = frameProvider;

        mImeFrameProvider = imeFrameProvider;
@@ -343,7 +344,7 @@ class InsetsSourceProvider { 
        updateVisibility();

        mControl = new InsetsSourceControl(mSource.getType(), leash, surfacePosition,

                mSource.calculateInsets(mWin.getBounds(), true /* ignoreVisibility */));

        ProtoLog.d(WM_DEBUG_IME,

        ProtoLog.d(WM_DEBUG_WINDOW_INSETS,

                "InsetsSource Control %s for target %s", mControl, mControlTarget);

    }
@@ -392,8 +393,9 @@ class InsetsSourceProvider { 


    protected void updateVisibility() {

        mSource.setVisible(mServerVisible && (isMirroredSource() || mClientVisible));

        ProtoLog.d(WM_DEBUG_IME,

                "InsetsSource updateVisibility serverVisible: %s clientVisible: %s",

        ProtoLog.d(WM_DEBUG_WINDOW_INSETS,

                "InsetsSource updateVisibility for %s, serverVisible: %s clientVisible: %s",

                InsetsState.typeToString(mSource.getType()),

                mServerVisible, mClientVisible);

    }
@@ -539,7 +541,7 @@ class InsetsSourceProvider { 
                t.setAlpha(animationLeash, 1 /* alpha */);

                t.hide(animationLeash);

            }

            ProtoLog.i(WM_DEBUG_IME,

            ProtoLog.i(WM_DEBUG_WINDOW_INSETS,

                    "ControlAdapter startAnimation mSource: %s controlTarget: %s", mSource,

                    mControlTarget);
@@ -555,7 +557,7 @@ class InsetsSourceProvider { 
                mControlTarget = null;

                mAdapter = null;

                setClientVisible(InsetsState.getDefaultVisibility(mSource.getType()));

                ProtoLog.i(WM_DEBUG_IME,

                ProtoLog.i(WM_DEBUG_WINDOW_INSETS,

                        "ControlAdapter onAnimationCancelled mSource: %s mControlTarget: %s",

                        mSource, mControlTarget);

            }

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

+3 −3
Original line number Diff line number Diff line
@@ -114,10 +114,10 @@ import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_ADD_REMOVE; 
import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_APP_TRANSITIONS;

import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_FOCUS;

import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_FOCUS_LIGHT;

import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_IME;

import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_ORIENTATION;

import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_RESIZE;

import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_STARTING_WINDOW;

import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_WINDOW_INSETS;

import static com.android.server.am.ActivityManagerService.MY_PID;

import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;

import static com.android.server.policy.WindowManagerPolicy.TRANSIT_ENTER;
@@ -3985,7 +3985,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
     * Called when the insets state changed.

     */

    void notifyInsetsChanged() {

        ProtoLog.d(WM_DEBUG_IME, "notifyInsetsChanged for %s ", this);

        ProtoLog.d(WM_DEBUG_WINDOW_INSETS, "notifyInsetsChanged for %s ", this);

        try {

            mClient.insetsChanged(getCompatInsetsState(),

                    hasMoved(),
@@ -3997,7 +3997,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 


    @Override

    public void notifyInsetsControlChanged() {

        ProtoLog.d(WM_DEBUG_IME, "notifyInsetsControlChanged for %s ", this);

        ProtoLog.d(WM_DEBUG_WINDOW_INSETS, "notifyInsetsControlChanged for %s ", this);

        if (mAppDied || mRemoved) {

            return;

        }