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

Commit 274035a5 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Update usages of isEnabled protolog API 

We now have an additional parameter to this function to make sure we don't have any extra cost if a group level is not enabled.

Bug: 327341670

Test: presubmit
Change-Id: I0d68fdcd56c5ec43536b407dcb5606ae8aa18c5e
parent 7de1d5a2

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

+2 −4
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ import static com.android.server.wm.AppTransitionProto.LAST_USED_APP_TRANSITION; 
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;

import static com.android.server.wm.WindowManagerInternal.KeyguardExitAnimationStartListener;

import static com.android.server.wm.WindowStateAnimator.ROOT_TASK_CLIP_AFTER_ANIM;

import static com.android.server.wm.WindowStateAnimator.ROOT_TASK_CLIP_NONE;
@@ -105,7 +104,6 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.content.ComponentName;

import android.content.Context;

import android.content.res.Configuration;

import android.content.res.TypedArray;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;
@@ -117,7 +115,6 @@ import android.os.IBinder; 
import android.os.IRemoteCallback;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.util.Pair;

import android.util.Slog;
@@ -137,6 +134,7 @@ import android.view.animation.TranslateAnimation; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.policy.TransitionAnimation;

import com.android.internal.protolog.common.LogLevel;

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

import com.android.internal.util.DumpUtils.Dump;

import com.android.internal.util.function.pooled.PooledLambda;
@@ -244,7 +242,7 @@ public class AppTransition implements Dump { 
        mHandler = new Handler(service.mH.getLooper());

        mDisplayContent = displayContent;

        mTransitionAnimation = new TransitionAnimation(

                context, ProtoLog.isEnabled(WM_DEBUG_ANIM), TAG);

                context, ProtoLog.isEnabled(WM_DEBUG_ANIM, LogLevel.DEBUG), TAG);



        final TypedArray windowStyle = mContext.getTheme().obtainStyledAttributes(

                com.android.internal.R.styleable.Window);

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

+2 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.view.SurfaceControl.Transaction; 
import android.view.WindowManager;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.protolog.common.LogLevel;

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

import com.android.internal.util.FastPrintWriter;

import com.android.server.wm.SurfaceAnimator.AnimationType;
@@ -209,7 +210,7 @@ class RemoteAnimationController implements DeathRecipient { 
                Slog.e(TAG, "Failed to start remote animation", e);

                onAnimationFinished();

            }

            if (ProtoLog.isEnabled(WM_DEBUG_REMOTE_ANIMATIONS)) {

            if (ProtoLog.isEnabled(WM_DEBUG_REMOTE_ANIMATIONS, LogLevel.DEBUG)) {

                ProtoLog.d(WM_DEBUG_REMOTE_ANIMATIONS, "startAnimation(): Notify animation start:");

                writeStartDebugStatement();

            }

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

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.view.SurfaceControl; 
import android.view.SurfaceControl.Transaction;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.protolog.common.LogLevel;

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



import java.io.PrintWriter;
@@ -192,7 +193,7 @@ public class SurfaceAnimator { 
            return;

        }

        mAnimation.startAnimation(mLeash, t, type, mInnerAnimationFinishedCallback);

        if (ProtoLog.isEnabled(WM_DEBUG_ANIM)) {

        if (ProtoLog.isEnabled(WM_DEBUG_ANIM, LogLevel.DEBUG)) {

            StringWriter sw = new StringWriter();

            PrintWriter pw = new PrintWriter(sw);

            mAnimation.dump(pw, "");

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

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static android.app.WallpaperManager.COMMAND_UNFREEZE; 
import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;

import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;

import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER;



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

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

+2 −1
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ import android.window.WindowContainerToken; 
import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.graphics.ColorUtils;

import com.android.internal.protolog.common.LogLevel;

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

import com.android.internal.util.ToBooleanFunction;

import com.android.server.wm.SurfaceAnimator.Animatable;
@@ -3405,7 +3406,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
                // ActivityOption#makeCustomAnimation or WindowManager#overridePendingTransition.

                a.restrictDuration(MAX_APP_TRANSITION_DURATION);

            }

            if (ProtoLog.isEnabled(WM_DEBUG_ANIM)) {

            if (ProtoLog.isEnabled(WM_DEBUG_ANIM, LogLevel.DEBUG)) {

                ProtoLog.i(WM_DEBUG_ANIM, "Loaded animation %s for %s, duration: %d, stack=%s",

                        a, this, ((a != null) ? a.getDuration() : 0), Debug.getCallers(20));

            }