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

Commit f51bb078 authored by Issei Suzuki's avatar Issei Suzuki Committed by Android (Google) Code Review
Browse files

Merge "Migrate DEBUG_ANIM logcat message to ProtoLog." into tm-dev

parents be8f4d0c f3732b49
Loading
Loading
Loading
Loading
+11 −8
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ import static android.view.WindowManager.TRANSIT_OLD_WALLPAPER_INTRA_CLOSE;
import static android.view.WindowManager.TRANSIT_OLD_WALLPAPER_INTRA_OPEN;
import static android.view.WindowManager.TRANSIT_OPEN;

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

import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.ActivityManager;
@@ -60,6 +62,7 @@ import android.view.animation.ScaleAnimation;
import android.view.animation.TranslateAnimation;

import com.android.internal.R;
import com.android.internal.protolog.common.ProtoLog;

import java.util.List;

@@ -295,9 +298,9 @@ public class TransitionAnimation {
    @Nullable
    private AttributeCache.Entry getCachedAnimations(LayoutParams lp) {
        if (mDebug) {
            Slog.v(mTag, "Loading animations: layout params pkg="
                    + (lp != null ? lp.packageName : null)
                    + " resId=0x" + (lp != null ? Integer.toHexString(lp.windowAnimations) : null));
            ProtoLog.v(WM_DEBUG_ANIM, "Loading animations: layout params pkg=%s resId=0x%x",
                    lp != null ? lp.packageName : null,
                    lp != null ? lp.windowAnimations : 0);
        }
        if (lp != null && lp.windowAnimations != 0) {
            // If this is a system resource, don't try to load it from the
@@ -309,7 +312,7 @@ public class TransitionAnimation {
                packageName = DEFAULT_PACKAGE;
            }
            if (mDebug) {
                Slog.v(mTag, "Loading animations: picked package=" + packageName);
                ProtoLog.v(WM_DEBUG_ANIM, "Loading animations: picked package=%s", packageName);
            }
            return AttributeCache.instance().get(packageName, resId,
                    com.android.internal.R.styleable.WindowAnimation);
@@ -320,16 +323,16 @@ public class TransitionAnimation {
    @Nullable
    private AttributeCache.Entry getCachedAnimations(String packageName, int resId) {
        if (mDebug) {
            Slog.v(mTag, "Loading animations: package="
                    + packageName + " resId=0x" + Integer.toHexString(resId));
            ProtoLog.v(WM_DEBUG_ANIM, "Loading animations: package=%s resId=0x%x",
                    packageName, resId);
        }
        if (packageName != null) {
            if ((resId & 0xFF000000) == 0x01000000) {
                packageName = DEFAULT_PACKAGE;
            }
            if (mDebug) {
                Slog.v(mTag, "Loading animations: picked package="
                        + packageName);
                ProtoLog.v(WM_DEBUG_ANIM, "Loading animations: picked package=%s",
                        packageName);
            }
            return AttributeCache.instance().get(packageName, resId,
                    com.android.internal.R.styleable.WindowAnimation);
+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ public enum ProtoLogGroup implements IProtoLogGroup {
            Consts.TAG_WM),
    WM_DEBUG_APP_TRANSITIONS(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,
            Consts.TAG_WM),
    WM_DEBUG_ANIM(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false, Consts.TAG_WM),
    WM_DEBUG_APP_TRANSITIONS_ANIM(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,
            Consts.TAG_WM),
    WM_DEBUG_RECENTS_ANIMATIONS(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,
+177 −0
Original line number Diff line number Diff line
@@ -67,6 +67,12 @@
      "group": "WM_DEBUG_TASKS",
      "at": "com\/android\/server\/wm\/Task.java"
    },
    "-2052051397": {
      "message": "Clear animatingExit: reason=destroySurface win=%s",
      "level": "DEBUG",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowState.java"
    },
    "-2049725903": {
      "message": "Task back pressed on root taskId=%d",
      "level": "VERBOSE",
@@ -133,6 +139,12 @@
      "group": "WM_DEBUG_SYNC_ENGINE",
      "at": "com\/android\/server\/wm\/BLASTSyncEngine.java"
    },
    "-1969928125": {
      "message": "Animation start for %s, anim=%s",
      "level": "DEBUG",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/SurfaceAnimator.java"
    },
    "-1963461591": {
      "message": "Removing %s from %s",
      "level": "VERBOSE",
@@ -169,6 +181,12 @@
      "group": "WM_DEBUG_STARTING_WINDOW",
      "at": "com\/android\/server\/wm\/ActivityRecord.java"
    },
    "-1933723759": {
      "message": "Clear animatingExit: reason=relayoutVisibleWindow win=%s",
      "level": "DEBUG",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowState.java"
    },
    "-1924376693": {
      "message": " Setting Ready-group to %b. group=%s from %s",
      "level": "VERBOSE",
@@ -631,6 +649,12 @@
      "group": "WM_DEBUG_ADD_REMOVE",
      "at": "com\/android\/server\/wm\/ActivityRecord.java"
    },
    "-1471518109": {
      "message": "Set animatingExit: reason=onAppVisibilityChanged win=%s",
      "level": "DEBUG",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowState.java"
    },
    "-1468740466": {
      "message": "Moving to PAUSED: %s (starting in paused state)",
      "level": "VERBOSE",
@@ -769,6 +793,12 @@
      "group": "WM_DEBUG_CONTENT_RECORDING",
      "at": "com\/android\/server\/wm\/ContentRecorder.java"
    },
    "-1318478129": {
      "message": "applyAnimation: win=%s anim=%d attr=0x%x a=%s transit=%d type=%d isEntrance=%b Callers %s",
      "level": "VERBOSE",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowStateAnimator.java"
    },
    "-1311436264": {
      "message": "Unregister task fragment organizer=%s uid=%d pid=%d",
      "level": "VERBOSE",
@@ -799,12 +829,24 @@
      "group": "WM_DEBUG_TASKS",
      "at": "com\/android\/server\/wm\/ActivityStarter.java"
    },
    "-1303628829": {
      "message": "**** STARTING EXIT",
      "level": "INFO",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/DisplayPolicy.java"
    },
    "-1292329638": {
      "message": "Added starting %s: startingWindow=%s startingView=%s",
      "level": "VERBOSE",
      "group": "WM_DEBUG_STARTING_WINDOW",
      "at": "com\/android\/server\/wm\/ActivityRecord.java"
    },
    "-1288007399": {
      "message": "performShowLocked: mDrawState=HAS_DRAWN in %s",
      "level": "VERBOSE",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowState.java"
    },
    "-1270731689": {
      "message": "Attempted to set replacing window on app token with no content %s",
      "level": "WARN",
@@ -853,6 +895,12 @@
      "group": "WM_DEBUG_RECENTS_ANIMATIONS",
      "at": "com\/android\/server\/wm\/RecentsAnimationController.java"
    },
    "-1209252064": {
      "message": "Clear animatingExit: reason=clearAnimatingFlags win=%s",
      "level": "DEBUG",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowState.java"
    },
    "-1207757583": {
      "message": "startAnimation(): Notify animation start: %s",
      "level": "DEBUG",
@@ -1237,6 +1285,12 @@
      "group": "WM_DEBUG_CONFIGURATION",
      "at": "com\/android\/server\/wm\/ActivityRecord.java"
    },
    "-799003045": {
      "message": "Set animatingExit: reason=remove\/replaceWindow win=%s",
      "level": "VERBOSE",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowState.java"
    },
    "-784959154": {
      "message": "Attempted to add private presentation window to a non-private display.  Aborting.",
      "level": "WARN",
@@ -1699,6 +1753,12 @@
      "group": "WM_DEBUG_WINDOW_TRANSITIONS",
      "at": "com\/android\/server\/wm\/Transition.java"
    },
    "-347866078": {
      "message": "Setting move animation on %s",
      "level": "VERBOSE",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowState.java"
    },
    "-344488673": {
      "message": "Finishing drawing window %s: mDrawState=%s",
      "level": "VERBOSE",
@@ -1723,6 +1783,12 @@
      "group": "WM_DEBUG_ADD_REMOVE",
      "at": "com\/android\/server\/wm\/WindowState.java"
    },
    "-319689203": {
      "message": "Reparenting to original parent: %s for %s",
      "level": "INFO",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/SurfaceAnimator.java"
    },
    "-317761482": {
      "message": "Create sleep token: tag=%s, displayId=%d",
      "level": "DEBUG",
@@ -1831,6 +1897,18 @@
      "group": "WM_DEBUG_APP_TRANSITIONS",
      "at": "com\/android\/server\/wm\/WindowState.java"
    },
    "-208664771": {
      "message": "Reparenting to leash for %s",
      "level": "INFO",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/SurfaceAnimator.java"
    },
    "-203358733": {
      "message": "commitFinishDrawingLocked: mDrawState=READY_TO_SHOW %s",
      "level": "INFO",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowStateAnimator.java"
    },
    "-198463978": {
      "message": "updateRotationUnchecked: alwaysSendConfiguration=%b forceRelayout=%b",
      "level": "VERBOSE",
@@ -1927,6 +2005,12 @@
      "group": "WM_DEBUG_RECENTS_ANIMATIONS",
      "at": "com\/android\/server\/wm\/RecentsAnimation.java"
    },
    "-91393839": {
      "message": "Set animatingExit: reason=remove\/applyAnimation win=%s",
      "level": "VERBOSE",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowState.java"
    },
    "-90559682": {
      "message": "Config is skipping already pausing %s",
      "level": "VERBOSE",
@@ -1993,6 +2077,12 @@
      "group": "WM_DEBUG_APP_TRANSITIONS_ANIM",
      "at": "com\/android\/server\/wm\/WindowContainer.java"
    },
    "-32102932": {
      "message": "Error sending initial configuration change to WindowContainer overlay",
      "level": "ERROR",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowContainer.java"
    },
    "-23020844": {
      "message": "Back: Reset surfaces",
      "level": "DEBUG",
@@ -2227,6 +2317,12 @@
      "group": "WM_DEBUG_RECENTS_ANIMATIONS",
      "at": "com\/android\/server\/wm\/Task.java"
    },
    "215077284": {
      "message": "Animation start delayed for %s",
      "level": "INFO",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/SurfaceAnimator.java"
    },
    "221540118": {
      "message": "mUserActivityTimeout set to %d",
      "level": "DEBUG",
@@ -2317,6 +2413,12 @@
      "group": "WM_DEBUG_APP_TRANSITIONS_ANIM",
      "at": "com\/android\/server\/wm\/AppTransition.java"
    },
    "283489582": {
      "message": "Clear animatingExit: reason=exitAnimationDone win=%s",
      "level": "DEBUG",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowState.java"
    },
    "288485303": {
      "message": "Attempted to set remove mode to a display that does not exist: %d",
      "level": "WARN",
@@ -2389,6 +2491,12 @@
      "group": "WM_DEBUG_STATES",
      "at": "com\/android\/server\/wm\/TaskFragment.java"
    },
    "341360111": {
      "message": "selectAnimation in %s: transit=%d",
      "level": "INFO",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/DisplayPolicy.java"
    },
    "342460966": {
      "message": "DRAG %s: pos=(%d,%d)",
      "level": "INFO",
@@ -2455,6 +2563,12 @@
      "group": "WM_DEBUG_STATES",
      "at": "com\/android\/server\/wm\/TaskFragment.java"
    },
    "385595355": {
      "message": "Starting animation on %s: type=%d, anim=%s",
      "level": "VERBOSE",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowContainer.java"
    },
    "397105698": {
      "message": "grantEmbeddedWindowFocus remove request for win=%s dropped since no candidate was found",
      "level": "VERBOSE",
@@ -2467,6 +2581,12 @@
      "group": "WM_DEBUG_STATES",
      "at": "com\/android\/server\/wm\/ActivityRecord.java"
    },
    "397862437": {
      "message": "Cancelling animation restarting=%b for %s",
      "level": "INFO",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/SurfaceAnimator.java"
    },
    "399841913": {
      "message": "SURFACE RECOVER DESTROY: %s",
      "level": "INFO",
@@ -2833,6 +2953,12 @@
      "group": "WM_DEBUG_RECENTS_ANIMATIONS",
      "at": "com\/android\/server\/wm\/RecentsAnimation.java"
    },
    "769218938": {
      "message": "Loaded animation %s for %s, duration: %d, stack=%s",
      "level": "INFO",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowContainer.java"
    },
    "778774915": {
      "message": "Unable to record task since feature is disabled %d",
      "level": "VERBOSE",
@@ -2989,6 +3115,12 @@
      "group": "WM_DEBUG_REMOTE_ANIMATIONS",
      "at": "com\/android\/server\/wm\/RemoteAnimationController.java"
    },
    "975275467": {
      "message": "Set animatingExit: reason=remove\/isAnimating win=%s",
      "level": "VERBOSE",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowState.java"
    },
    "979347997": {
      "message": "Launch on display check: disallow activity embedding without permission.",
      "level": "DEBUG",
@@ -3157,6 +3289,12 @@
      "group": "WM_DEBUG_WINDOW_ORGANIZER",
      "at": "com\/android\/server\/wm\/DisplayAreaOrganizerController.java"
    },
    "1164325516": {
      "message": "onExitAnimationDone in %s: exiting=%b remove=%b selfAnimating=%b anim=%s",
      "level": "VERBOSE",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowState.java"
    },
    "1166381079": {
      "message": "Execute app transition: %s, displayId: %d Callers=%s",
      "level": "WARN",
@@ -3301,6 +3439,12 @@
      "group": "WM_DEBUG_WINDOW_TRANSITIONS",
      "at": "com\/android\/server\/wm\/TransitionController.java"
    },
    "1335791109": {
      "message": "createSurface %s: mDrawState=DRAW_PENDING",
      "level": "INFO",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowStateAnimator.java"
    },
    "1337596507": {
      "message": "Sending to proc %s new compat %s",
      "level": "VERBOSE",
@@ -3715,6 +3859,12 @@
      "group": "WM_DEBUG_APP_TRANSITIONS",
      "at": "com\/android\/server\/wm\/ActivityRecord.java"
    },
    "1810209625": {
      "message": "Animation done in %s: exiting=%b, reportedVisible=%b",
      "level": "VERBOSE",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowStateAnimator.java"
    },
    "1822314934": {
      "message": "Expected target rootTask=%s to restored behind rootTask=%s but it is behind rootTask=%s",
      "level": "WARN",
@@ -3793,6 +3943,12 @@
      "group": "WM_DEBUG_WINDOW_ORGANIZER",
      "at": "com\/android\/server\/wm\/DisplayAreaPolicyBuilder.java"
    },
    "1878927091": {
      "message": "prepareSurface: No changes in animation for %s",
      "level": "VERBOSE",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowStateAnimator.java"
    },
    "1891501279": {
      "message": "cancelAnimation(): reason=%s",
      "level": "DEBUG",
@@ -3895,6 +4051,12 @@
      "group": "WM_DEBUG_FOCUS_LIGHT",
      "at": "com\/android\/server\/wm\/InputMonitor.java"
    },
    "2010476671": {
      "message": "Animation done in %s: reportedVisible=%b okToDisplay=%b okToAnimate=%b startingDisplayed=%b",
      "level": "VERBOSE",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/ActivityRecord.java"
    },
    "2018454757": {
      "message": "WS.removeImmediately: %s Already removed...",
      "level": "VERBOSE",
@@ -3907,6 +4069,12 @@
      "group": "WM_DEBUG_STARTING_WINDOW",
      "at": "com\/android\/server\/wm\/ActivityRecord.java"
    },
    "2019765997": {
      "message": "selectRotationAnimation topFullscreen=%s rotationAnimation=%d forceJumpcut=%b",
      "level": "INFO",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/DisplayRotation.java"
    },
    "2022422429": {
      "message": "createAnimationAdapter(): container=%s",
      "level": "DEBUG",
@@ -3961,6 +4129,12 @@
      "group": "WM_DEBUG_WINDOW_INSETS",
      "at": "com\/android\/server\/wm\/InsetsSourceProvider.java"
    },
    "2075693141": {
      "message": "Set animatingExit: reason=startExitingAnimation\/%s win=%s",
      "level": "DEBUG",
      "group": "WM_DEBUG_ANIM",
      "at": "com\/android\/server\/wm\/WindowManagerService.java"
    },
    "2083556954": {
      "message": "Set mOrientationChanging of %s",
      "level": "VERBOSE",
@@ -4020,6 +4194,9 @@
    "WM_DEBUG_ADD_REMOVE": {
      "tag": "WindowManager"
    },
    "WM_DEBUG_ANIM": {
      "tag": "WindowManager"
    },
    "WM_DEBUG_APP_TRANSITIONS": {
      "tag": "WindowManager"
    },
+4 −6
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ import static android.view.WindowManager.TRANSIT_FLAG_OPEN_BEHIND;
import static android.view.WindowManager.TRANSIT_OLD_UNSET;

import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_ADD_REMOVE;
import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_ANIM;
import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_APP_TRANSITIONS;
import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_APP_TRANSITIONS_ANIM;
import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_CONFIGURATION;
@@ -216,7 +217,6 @@ import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN;
import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS;
import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;
import static com.android.server.wm.WindowContainerChildProto.ACTIVITY;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_CONFIGURATION;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYOUT_REPEATS;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_STARTING_WINDOW_VERBOSE;
@@ -7237,11 +7237,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A

        getDisplayContent().computeImeTargetIfNeeded(this);

        if (DEBUG_ANIM) Slog.v(TAG, "Animation done in " + this
                + ": reportedVisible=" + reportedVisible
                + " okToDisplay=" + okToDisplay()
                + " okToAnimate=" + okToAnimate()
                + " startingDisplayed=" + startingDisplayed);
        ProtoLog.v(WM_DEBUG_ANIM, "Animation done in %s"
                + ": reportedVisible=%b okToDisplay=%b okToAnimate=%b startingDisplayed=%b",
                this, reportedVisible, okToDisplay(), okToAnimate(), startingDisplayed);

        // clean up thumbnail window
        if (mThumbnail != null) {
+4 −2
Original line number Diff line number Diff line
@@ -81,11 +81,11 @@ import static com.android.internal.R.styleable.WindowAnimation_wallpaperIntraOpe
import static com.android.internal.R.styleable.WindowAnimation_wallpaperIntraOpenExitAnimation;
import static com.android.internal.R.styleable.WindowAnimation_wallpaperOpenEnterAnimation;
import static com.android.internal.R.styleable.WindowAnimation_wallpaperOpenExitAnimation;
import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_ANIM;
import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_APP_TRANSITIONS;
import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_APP_TRANSITIONS_ANIM;
import static com.android.server.wm.AppTransitionProto.APP_TRANSITION_STATE;
import static com.android.server.wm.AppTransitionProto.LAST_USED_APP_TRANSITION;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM;
import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
import static com.android.server.wm.WindowManagerInternal.AppTransitionListener;
@@ -130,6 +130,7 @@ import android.view.animation.TranslateAnimation;

import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.policy.TransitionAnimation;
import com.android.internal.protolog.ProtoLogImpl;
import com.android.internal.protolog.common.ProtoLog;
import com.android.internal.util.DumpUtils.Dump;
import com.android.internal.util.function.pooled.PooledLambda;
@@ -237,7 +238,8 @@ public class AppTransition implements Dump {
        mService = service;
        mHandler = new Handler(service.mH.getLooper());
        mDisplayContent = displayContent;
        mTransitionAnimation = new TransitionAnimation(context, DEBUG_ANIM, TAG);
        mTransitionAnimation = new TransitionAnimation(
                context, ProtoLogImpl.isEnabled(WM_DEBUG_ANIM), TAG);

        mGridLayoutRecentsEnabled = SystemProperties.getBoolean("ro.recents.grid", false);

Loading