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

Commit 4961960f authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Enable logcat for sleep token change 

To provide the info in regular device log.

Bug: 359333121
Flag: EXEMPT log event
Test: Turn off screen/unlock device and check log.
Change-Id: Ibe1c8947ad259431b70370205772466096c0b34d
parent d6050a9e

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

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ public enum ProtoLogGroup implements IProtoLogGroup { 
    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,

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

+5 −3
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import static android.view.WindowManager.TRANSIT_WAKE; 
import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_FOCUS_LIGHT;

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

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

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

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

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

import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_WALLPAPER;
@@ -2867,7 +2868,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
            token = new SleepToken(tag, displayId);

            mSleepTokens.put(tokenKey, token);

            display.mAllSleepTokens.add(token);

            ProtoLog.d(WM_DEBUG_STATES, "Create sleep token: tag=%s, displayId=%d", tag, displayId);

            ProtoLog.d(WM_DEBUG_SLEEP_TOKEN, "Create SleepToken: tag=%s, displayId=%d",

                    tag, displayId);

        } else {

            throw new RuntimeException("Create the same sleep token twice: " + token);

        }
@@ -2886,8 +2888,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
            return;

        }



        ProtoLog.d(WM_DEBUG_STATES, "Remove sleep token: tag=%s, displayId=%d", token.mTag,

                token.mDisplayId);

        ProtoLog.d(WM_DEBUG_SLEEP_TOKEN, "Remove SleepToken: tag=%s, displayId=%d",

                token.mTag, token.mDisplayId);

        display.mAllSleepTokens.remove(token);

        if (display.mAllSleepTokens.isEmpty()) {

            mService.updateSleepIfNeededLocked();