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

Commit 5ec702b7 authored by Lucas Silva's avatar Lucas Silva
Browse files

Add additional logging to dream enforcement logic to debug failures. 

Bug: 246091760
Test: n/a
Change-Id: I171225b28e0661bf0a0b1b0ef6bdb3a4e85f64ea
parent 0b180ddb

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

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

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



    private final boolean mEnabled;

data/etc/services.core.protolog.json

+15 −0
Original line number Diff line number Diff line
@@ -3091,6 +3091,12 @@ 
      "group": "WM_DEBUG_STARTING_WINDOW",

      "at": "com\/android\/server\/wm\/WindowStateAnimator.java"

    },

    "829869827": {

      "message": "Cannot launch dream activity due to invalid state. dreaming: %b packageName: %s",

      "level": "ERROR",

      "group": "WM_DEBUG_DREAM",

      "at": "com\/android\/server\/wm\/ActivityTaskManagerService.java"

    },

    "835814848": {

      "message": "%s",

      "level": "INFO",
@@ -4123,6 +4129,12 @@ 
      "group": "WM_DEBUG_WINDOW_ORGANIZER",

      "at": "com\/android\/server\/wm\/TaskOrganizerController.java"

    },

    "1918771553": {

      "message": "Dream packageName does not match active dream. Package %s does not match %s or %s",

      "level": "ERROR",

      "group": "WM_DEBUG_DREAM",

      "at": "com\/android\/server\/wm\/ActivityTaskManagerService.java"

    },

    "1921821199": {

      "message": "Preserving %s until the new one is added",

      "level": "VERBOSE",
@@ -4365,6 +4377,9 @@ 
    "WM_DEBUG_DRAW": {

      "tag": "WindowManager"

    },

    "WM_DEBUG_DREAM": {

      "tag": "WindowManager"

    },

    "WM_DEBUG_FOCUS": {

      "tag": "WindowManager"

    },

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

+6 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ import static android.view.WindowManager.TRANSIT_PIP; 
import static android.view.WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_TO_LAUNCHER_CLEAR_SNAPSHOT;



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

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

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

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

import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_LOCKTASK;
@@ -1446,6 +1447,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 


    boolean canLaunchDreamActivity(String packageName) {

        if (!mDreaming || packageName == null) {

            ProtoLog.e(WM_DEBUG_DREAM, "Cannot launch dream activity due to invalid state. "

                    + "dreaming: %b packageName: %s", mDreaming, packageName);

            return false;

        }

        final DreamManagerInternal dreamManager =
@@ -1461,6 +1464,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        if (activeDoze != null && packageName.equals(activeDoze.getPackageName())) {

            return true;

        }

        ProtoLog.e(WM_DEBUG_DREAM,

                "Dream packageName does not match active dream. Package %s does not match %s or %s",

                packageName, String.valueOf(activeDream), String.valueOf(activeDoze));

        return false;

    }