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

Commit 2ebaa38f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "remove-protolog-dead-code" into main 

* changes:
  Rename ProtoLogGroup parameters for clarity
  Remove unused ProtoLogGroup methods
parents 5aa79340 29e9382b

apct-tests/perftests/tracing/src/com/android/internal/protolog/ProtoLogPerfTest.kt

+0 −14
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ class ProtoLogPerfTest(logType: LogType) { 
    @Before

    @Throws(ServiceManager.ServiceNotFoundException::class)

    fun setUp() {

        TEST_GROUP.isLogToProto = mLogToProto

        TEST_GROUP.isLogToLogcat = mLogToLogcat



        mProcessedProtoLogger =
@@ -224,7 +223,6 @@ class ProtoLogPerfTest(logType: LogType) { 
        val TEST_GROUP =

            object : IProtoLogGroup {

                private val mEnabled: Boolean = true

                @field:Volatile private var mLogToProto: Boolean = true

                @field:Volatile private var mLogToLogcat: Boolean = true

                private val mTag: String = "WindowManagerProtoLogTest"
@@ -232,26 +230,14 @@ class ProtoLogPerfTest(logType: LogType) { 
                    return mEnabled

                }



                override fun isLogToProto(): Boolean {

                    return mLogToProto

                }



                override fun isLogToLogcat(): Boolean {

                    return mLogToLogcat

                }



                override fun isLogToAny(): Boolean {

                    return mLogToLogcat || mLogToProto

                }



                override fun getTag(): String? {

                    return mTag

                }



                override fun setLogToProto(logToProto: Boolean) {

                    this.mLogToProto = logToProto

                }



                override fun setLogToLogcat(logToLogcat: Boolean) {

                    this.mLogToLogcat = logToLogcat

                }

core/java/android/view/ViewProtoLogGroups.java

+6 −6
Original line number Diff line number Diff line
@@ -30,17 +30,17 @@ import com.android.internal.protolog.ProtoLogGroup; 
 */

public final class ViewProtoLogGroups {

    static final ProtoLogGroup IME_INSETS_CONTROLLER = new ProtoLogGroup(

            "IME_INSETS_CONTROLLER", "InsetsController", true /* enabled */);

            "IME_INSETS_CONTROLLER", "InsetsController", true /* logToLogcat */);

    static final ProtoLogGroup INSETS_CONTROLLER_DEBUG = new ProtoLogGroup(

            "INSETS_CONTROLLER_DEBUG", "InsetsController", false /* enabled */);

            "INSETS_CONTROLLER_DEBUG", "InsetsController", false /* logToLogcat */);

    static final ProtoLogGroup INSETS_ANIMATION_CONTROLLER = new ProtoLogGroup(

            "INSETS_ANIMATION_CONTROLLER", "InsetsAnimationCtrlImpl", false /* enabled */);

            "INSETS_ANIMATION_CONTROLLER", "InsetsAnimationCtrlImpl", false /* logToLogcat */);

    public static final ProtoLogGroup IME_TRACKER = new ProtoLogGroup(

            "IME_TRACKER", ImeTracker.TAG, true /* enabled */);

            "IME_TRACKER", ImeTracker.TAG, true /* logToLogcat */);

    public static final ProtoLogGroup INPUT_METHOD_MANAGER_DEBUG = new ProtoLogGroup(

            "INPUT_METHOD_MANAGER", "InputMethodManager", false /* enabled */);

            "INPUT_METHOD_MANAGER", "InputMethodManager", false /* logToLogcat */);

    public static final ProtoLogGroup INPUT_METHOD_MANAGER_WITH_LOGCAT = new ProtoLogGroup(

            "INPUT_METHOD_MANAGER_LOGCAT", "InputMethodManager", true /* enabled */);

            "INPUT_METHOD_MANAGER_LOGCAT", "InputMethodManager", true /* logToLogcat */);



    static final ProtoLogGroup[] ALL_GROUPS = {

            IME_INSETS_CONTROLLER,

core/java/com/android/internal/protolog/LogcatOnlyProtoLogImpl.java

+1 −8
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.internal.protolog;



import static com.android.internal.protolog.ProtoLog.REQUIRE_PROTOLOGTOOL;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.ravenwood.annotation.RavenwoodKeepWholeClass;
@@ -54,12 +52,7 @@ public class LogcatOnlyProtoLogImpl implements IProtoLog { 
    @Override

    public void log(@NonNull LogLevel logLevel, @NonNull IProtoLogGroup group,

            @NonNull String messageString, @NonNull Object[] args) {

        if (REQUIRE_PROTOLOGTOOL && group.isLogToProto()) {

            Log.w(LOG_TAG, "ProtoLog message not processed. Failed to log it to proto. "

                    + "Logging it below to logcat instead.");

        }



        if (group.isLogToLogcat() || group.isLogToProto()) {

        if (group.isLogToLogcat()) {

            String formattedString = TextUtils.formatSimple(messageString, args);

            switch (logLevel) {

                case VERBOSE -> Log.v(group.getTag(), formattedString);

core/java/com/android/internal/protolog/ProtoLogGroup.java

+5 −19
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ public class ProtoLogGroup implements IProtoLogGroup { 
    private final String mName;

    @NonNull

    private final String mTag;

    private final boolean mEnabled;

    private boolean mLogToProto;

    private boolean mLogToLogcat;



    public ProtoLogGroup(@NonNull String name) {
@@ -39,23 +37,17 @@ public class ProtoLogGroup implements IProtoLogGroup { 
        this(name, tag, true);

    }



    public ProtoLogGroup(@NonNull String name, @NonNull String tag, boolean enabled) {

    public ProtoLogGroup(@NonNull String name, @NonNull String tag, boolean logToLogcat) {

        mName = name;

        mTag = tag;

        mEnabled = enabled;

        mLogToProto = enabled;

        mLogToLogcat = enabled;

        mLogToLogcat = logToLogcat;

    }



    @Override

    public boolean isEnabled() {

        return mEnabled;

    }



    @Deprecated

    @Override

    public boolean isLogToProto() {

        return mLogToProto;

        // Should only be called by the source code pre-processor and this type of ProtoLogGroup is

        // not yet supported by the ProtoLogTool so this should never be called.

        throw new UnsupportedOperationException("ProtoLogGroup.isEnabled() should not be called");

    }



    @Override
@@ -69,12 +61,6 @@ public class ProtoLogGroup implements IProtoLogGroup { 
        return mTag;

    }



    @Deprecated

    @Override

    public void setLogToProto(boolean logToProto) {

        mLogToProto = logToProto;

    }



    @Override

    public void setLogToLogcat(boolean logToLogcat) {

        mLogToLogcat = logToLogcat;

core/java/com/android/internal/protolog/WmProtoLogGroups.java

+48 −103
Original line number Diff line number Diff line
@@ -22,95 +22,58 @@ import java.util.UUID; 


/**

 * Defines logging groups for ProtoLog.

 *

 * This file is used by the ProtoLogTool to generate optimized logging code. All of its dependencies

 * must be included in services.core.wm.protologgroups build target.

 * <p>This file is used by the ProtoLogTool to generate optimized logging code. All of its

 * dependencies must be included in services.core.wm.protologgroups build target.

 */

public enum WmProtoLogGroups implements IProtoLogGroup {

    WM_ERROR(true, true, true, Consts.TAG_WM),

    WM_DEBUG_ORIENTATION(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_ORIENTATION_CHANGE(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,

            Consts.TAG_WM),

    WM_DEBUG_FOCUS_LIGHT(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_BOOT(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_RESIZE(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_ADD_REMOVE(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_CONFIGURATION(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_SWITCH(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_CONTAINERS(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_FOCUS(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_IMMERSIVE(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_LOCKTASK(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_STATES(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_TASKS(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_ERROR(true, true, Consts.TAG_WM),

    WM_DEBUG_ORIENTATION(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_ORIENTATION_CHANGE(Consts.ENABLE_DEBUG, true, Consts.TAG_WM),

    WM_DEBUG_FOCUS_LIGHT(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_BOOT(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_RESIZE(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_ADD_REMOVE(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_CONFIGURATION(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_SWITCH(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_CONTAINERS(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_FOCUS(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_IMMERSIVE(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_LOCKTASK(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_STATES(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_TASKS(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

  // TODO: b/420917959 - Disable launch params logging this once the bug is fixed.

    WM_DEBUG_TASKS_LAUNCH_PARAMS(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,

            Consts.TAG_WM),

    WM_DEBUG_STARTING_WINDOW(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_SHOW_TRANSACTIONS(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_SHOW_SURFACE_ALLOC(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            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,

            Consts.TAG_WM),

    WM_DEBUG_DRAW(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_REMOTE_ANIMATIONS(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_SCREEN_ON(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_KEEP_SCREEN_ON(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_SLEEP_TOKEN(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,

            Consts.TAG_WM),

    WM_DEBUG_WINDOW_MOVEMENT(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_IME(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_WINDOW_ORGANIZER(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_SYNC_ENGINE(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_WINDOW_TRANSITIONS(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_WINDOW_TRANSITIONS_MIN(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,

            Consts.TAG_WM),

    WM_DEBUG_WINDOW_INSETS(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_CONTENT_RECORDING(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,

            Consts.TAG_WM),

    WM_DEBUG_WALLPAPER(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_BACK_PREVIEW(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true,

            "CoreBackPreview"),

    WM_DEBUG_DREAM(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, true, Consts.TAG_WM),



    WM_DEBUG_DIMMER(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_TPL(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_EMBEDDED_WINDOWS(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    WM_DEBUG_PRESENTATION(Consts.ENABLE_DEBUG, Consts.ENABLE_LOG_TO_PROTO_DEBUG, false,

            Consts.TAG_WM),

    TEST_GROUP(true, true, false, "WindowManagerProtoLogTest");

    WM_DEBUG_TASKS_LAUNCH_PARAMS(Consts.ENABLE_DEBUG, true, Consts.TAG_WM),

    WM_DEBUG_STARTING_WINDOW(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_SHOW_TRANSACTIONS(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_SHOW_SURFACE_ALLOC(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_APP_TRANSITIONS(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_ANIM(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_APP_TRANSITIONS_ANIM(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_RECENTS_ANIMATIONS(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_DRAW(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_REMOTE_ANIMATIONS(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_SCREEN_ON(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_KEEP_SCREEN_ON(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_SLEEP_TOKEN(Consts.ENABLE_DEBUG, true, Consts.TAG_WM),

    WM_DEBUG_WINDOW_MOVEMENT(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_IME(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_WINDOW_ORGANIZER(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_SYNC_ENGINE(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_WINDOW_TRANSITIONS(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_WINDOW_TRANSITIONS_MIN(Consts.ENABLE_DEBUG, true, Consts.TAG_WM),

    WM_DEBUG_WINDOW_INSETS(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_CONTENT_RECORDING(Consts.ENABLE_DEBUG, true, Consts.TAG_WM),

    WM_DEBUG_WALLPAPER(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_BACK_PREVIEW(Consts.ENABLE_DEBUG, true, "CoreBackPreview"),

    WM_DEBUG_DREAM(Consts.ENABLE_DEBUG, true, Consts.TAG_WM),



    WM_DEBUG_DIMMER(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_TPL(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_EMBEDDED_WINDOWS(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    WM_DEBUG_PRESENTATION(Consts.ENABLE_DEBUG, false, Consts.TAG_WM),

    TEST_GROUP(true, false, "WindowManagerProtoLogTest");



    private final boolean mEnabled;

    private volatile boolean mLogToProto;

    private volatile boolean mLogToLogcat;

    private final String mTag;
@@ -118,13 +81,11 @@ public enum WmProtoLogGroups implements IProtoLogGroup { 
     * @param enabled     set to false to exclude all log statements for this group from

     *                    compilation,

     *                    they will not be available in runtime.

     * @param logToProto  enable binary logging for the group

     * @param logToLogcat enable text logging for the group

     * @param tag         name of the source of the logged message

     */

    WmProtoLogGroups(boolean enabled, boolean logToProto, boolean logToLogcat, String tag) {

    WmProtoLogGroups(boolean enabled, boolean logToLogcat, String tag) {

        this.mEnabled = enabled;

        this.mLogToProto = logToProto;

        this.mLogToLogcat = logToLogcat;

        this.mTag = tag;

    }
@@ -134,31 +95,16 @@ public enum WmProtoLogGroups implements IProtoLogGroup { 
        return mEnabled;

    }



    @Override

    public boolean isLogToProto() {

        return mLogToProto;

    }



    @Override

    public boolean isLogToLogcat() {

        return mLogToLogcat;

    }



    @Override

    public boolean isLogToAny() {

        return mLogToLogcat || mLogToProto;

    }



    @Override

    public String getTag() {

        return mTag;

    }



    @Override

    public void setLogToProto(boolean logToProto) {

        this.mLogToProto = logToProto;

    }



    @Override

    public void setLogToLogcat(boolean logToLogcat) {

        this.mLogToLogcat = logToLogcat;
@@ -173,7 +119,6 @@ public enum WmProtoLogGroups implements IProtoLogGroup { 
        private static final String TAG_WM = "WindowManager";



        private static final boolean ENABLE_DEBUG = true;

        private static final boolean ENABLE_LOG_TO_PROTO_DEBUG = true;

        private static final int START_ID = (int) (

                UUID.nameUUIDFromBytes(WmProtoLogGroups.class.getName().getBytes())

                        .getMostSignificantBits() % Integer.MAX_VALUE);