From b39d8489a343ba5553f3f633ce66441d7076dabb Mon Sep 17 00:00:00 2001
From: Issei Suzuki <issei@google.com>
Date: Tue, 17 May 2022 15:33:46 +0000
Subject: [PATCH] Revert ProtoLog to Slog in framework.jar

ProtoLog is only supported in WM sources at this moment.
This partially reverts commit I4461eddd4a24c7bba1adef1571ce0fbf6d7db0a2.

Bug: 231342674
Test: Pass existing tests.
Change-Id: Ibe5ca4f8a18f92379e3aae8bd9c7c6f456df5810
---
 .../internal/policy/TransitionAnimation.java  | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/core/java/com/android/internal/policy/TransitionAnimation.java b/core/java/com/android/internal/policy/TransitionAnimation.java
index fd8534d45b2b2..377dfd0fb1372 100644
--- a/core/java/com/android/internal/policy/TransitionAnimation.java
+++ b/core/java/com/android/internal/policy/TransitionAnimation.java
@@ -29,8 +29,6 @@ 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;
@@ -62,7 +60,6 @@ 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;
 
@@ -298,9 +295,9 @@ public class TransitionAnimation {
     @Nullable
     private AttributeCache.Entry getCachedAnimations(LayoutParams lp) {
         if (mDebug) {
-            ProtoLog.v(WM_DEBUG_ANIM, "Loading animations: layout params pkg=%s resId=0x%x",
-                    lp != null ? lp.packageName : null,
-                    lp != null ? lp.windowAnimations : 0);
+            Slog.v(mTag, "Loading animations: layout params pkg="
+                    + (lp != null ? lp.packageName : null)
+                    + " resId=0x" + (lp != null ? Integer.toHexString(lp.windowAnimations) : null));
         }
         if (lp != null && lp.windowAnimations != 0) {
             // If this is a system resource, don't try to load it from the
@@ -312,7 +309,7 @@ public class TransitionAnimation {
                 packageName = DEFAULT_PACKAGE;
             }
             if (mDebug) {
-                ProtoLog.v(WM_DEBUG_ANIM, "Loading animations: picked package=%s", packageName);
+                Slog.v(mTag, "Loading animations: picked package=" + packageName);
             }
             return AttributeCache.instance().get(packageName, resId,
                     com.android.internal.R.styleable.WindowAnimation);
@@ -323,16 +320,16 @@ public class TransitionAnimation {
     @Nullable
     private AttributeCache.Entry getCachedAnimations(String packageName, int resId) {
         if (mDebug) {
-            ProtoLog.v(WM_DEBUG_ANIM, "Loading animations: package=%s resId=0x%x",
-                    packageName, resId);
+            Slog.v(mTag, "Loading animations: package="
+                    + packageName + " resId=0x" + Integer.toHexString(resId));
         }
         if (packageName != null) {
             if ((resId & 0xFF000000) == 0x01000000) {
                 packageName = DEFAULT_PACKAGE;
             }
             if (mDebug) {
-                ProtoLog.v(WM_DEBUG_ANIM, "Loading animations: picked package=%s",
-                        packageName);
+                Slog.v(mTag, "Loading animations: picked package="
+                        + packageName);
             }
             return AttributeCache.instance().get(packageName, resId,
                     com.android.internal.R.styleable.WindowAnimation);