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

Commit 84e9ad00 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Rename ProtoLogGroup to WmProtoLogGroups 

This is a first step refactor to create a ProtoLogGroup class that can
be used to create the protolog groups instead of using enums, which
should be immutable and are currently not being used as such.

Bug: 369370597
Test: m droid
Flag: EXEMPT renaming refactor
Change-Id: I58bef1b339f6f44c0ab460b7ba779140992b9774
parent 2eded168

core/java/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ java_library { 
java_library {

    name: "protolog-groups",

    srcs: [

        "com/android/internal/protolog/ProtoLogGroup.java",

        "com/android/internal/protolog/WmProtoLogGroups.java",

        ":protolog-common-src",

    ],

}

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

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import java.util.UUID; 
 * 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 ProtoLogGroup implements IProtoLogGroup {

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),
@@ -115,7 +115,7 @@ public enum ProtoLogGroup implements IProtoLogGroup { 
     * @param logToLogcat enable text logging for the group

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

     */

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

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

        this.mEnabled = enabled;

        this.mLogToProto = logToProto;

        this.mLogToLogcat = logToLogcat;
@@ -168,7 +168,7 @@ public enum ProtoLogGroup implements IProtoLogGroup { 
        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(ProtoLogGroup.class.getName().getBytes())

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

                        .getMostSignificantBits() % Integer.MAX_VALUE);

    }

}

services/core/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ genrule { 
    tools: ["protologtool"],

    cmd: "$(location protologtool) transform-protolog-calls " +

        "--protolog-class com.android.internal.protolog.ProtoLog " +

        "--loggroups-class com.android.internal.protolog.ProtoLogGroup " +

        "--loggroups-class com.android.internal.protolog.WmProtoLogGroups " +

        "--loggroups-jar $(location :protolog-groups) " +

        "--viewer-config-file-path /etc/core.protolog.pb " +

        "--legacy-viewer-config-file-path /system/etc/protolog.conf.json.gz " +
@@ -79,7 +79,7 @@ genrule { 
    tools: ["protologtool"],

    cmd: "$(location protologtool) generate-viewer-config " +

        "--protolog-class com.android.internal.protolog.ProtoLog " +

        "--loggroups-class com.android.internal.protolog.ProtoLogGroup " +

        "--loggroups-class com.android.internal.protolog.WmProtoLogGroups " +

        "--loggroups-jar $(location :protolog-groups) " +

        "--viewer-config-type json " +

        "--viewer-config $(out) " +
@@ -96,7 +96,7 @@ genrule { 
    tools: ["protologtool"],

    cmd: "$(location protologtool) generate-viewer-config " +

        "--protolog-class com.android.internal.protolog.ProtoLog " +

        "--loggroups-class com.android.internal.protolog.ProtoLogGroup " +

        "--loggroups-class com.android.internal.protolog.WmProtoLogGroups " +

        "--loggroups-jar $(location :protolog-groups) " +

        "--viewer-config-type proto " +

        "--viewer-config $(out) " +

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ import static android.provider.Settings.Global.WAIT_FOR_DEBUGGER; 
import static android.util.FeatureFlagUtils.SETTINGS_ENABLE_MONITOR_PHANTOM_PROCS;

import static android.view.Display.INVALID_DISPLAY;













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













import static com.android.internal.protolog.WmProtoLogGroups.WM_DEBUG_CONFIGURATION;















import static com.android.internal.util.FrameworkStatsLog.UNSAFE_INTENT_EVENT_REPORTED__EVENT_TYPE__NEW_MUTABLE_IMPLICIT_PENDING_INTENT_RETRIEVED;















import static com.android.sdksandbox.flags.Flags.sdkSandboxInstrumentationInfo;















import static com.android.server.am.ActiveServices.FGS_SAW_RESTRICTIONS;

































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



+2
−2




























Original line number
Diff line number
Diff line








@@ -42,8 +42,8 @@ import static android.view.WindowManager.TRANSIT_CHANGE;













import static android.view.WindowManager.TRANSIT_TO_BACK;















import static android.view.WindowManager.TRANSIT_TO_FRONT;





























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













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













import static com.android.internal.protolog.WmProtoLogGroups.WM_DEBUG_CONFIGURATION;













import static com.android.internal.protolog.WmProtoLogGroups.WM_DEBUG_IMMERSIVE;















import static com.android.server.wm.ActivityRecord.State.DESTROYED;















import static com.android.server.wm.ActivityRecord.State.DESTROYING;















import static com.android.server.wm.ActivityRecord.State.PAUSING;