diff options
| author | Issei Suzuki <issei@google.com> | 2022-02-07 17:43:56 +0000 |
|---|---|---|
| committer | Issei Suzuki <issei@google.com> | 2022-03-21 14:00:13 +0100 |
| commit | f3732b4991886d4c84377e6c0ddafd2ff92bae72 (patch) | |
| tree | e9eb1a08b293809fbcaeb31262eb7cc49033275e /core/java | |
| parent | 5169706329be5f3204f319dfa397beab304309d5 (diff) | |
Migrate DEBUG_ANIM logcat message to ProtoLog.
Added more log messages around animatingExit.
Bug: 205335975
Test: Existing builds and tests pass.
Change-Id: I4461eddd4a24c7bba1adef1571ce0fbf6d7db0a2
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/policy/TransitionAnimation.java | 19 | ||||
| -rw-r--r-- | core/java/com/android/internal/protolog/ProtoLogGroup.java | 1 |
2 files changed, 12 insertions, 8 deletions
diff --git a/core/java/com/android/internal/policy/TransitionAnimation.java b/core/java/com/android/internal/policy/TransitionAnimation.java index 74749cc9bf0b..e2d250589a8f 100644 --- a/core/java/com/android/internal/policy/TransitionAnimation.java +++ b/core/java/com/android/internal/policy/TransitionAnimation.java @@ -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; @@ -320,9 +323,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 @@ -334,7 +337,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); @@ -345,16 +348,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); diff --git a/core/java/com/android/internal/protolog/ProtoLogGroup.java b/core/java/com/android/internal/protolog/ProtoLogGroup.java index 45c6d5f10a5a..7f36c79591b3 100644 --- a/core/java/com/android/internal/protolog/ProtoLogGroup.java +++ b/core/java/com/android/internal/protolog/ProtoLogGroup.java @@ -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, |
