Merge "Merge "Revert ProtoLog to Slog in framework.jar" into tm-dev am:... (f61e4822) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/policy/TransitionAnimation.java

+8 −11

Original line number	Diff line number	Diff line
		@@ -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);