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

Commit 622f054f authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev... 

Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev am: 13059cc2 am: bc4f4e5b
am: 51c34f7e

Change-Id: I8a41c084d20cea9d07d1a704fba3ea08b613d758
parents 32d437c1 51c34f7e

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

+2 −8
Original line number Diff line number Diff line
@@ -858,20 +858,14 @@ class RootWindowContainer extends WindowContainer<DisplayContent> { 
        final int privateflags = attrs.privateFlags;

        boolean displayHasContent = false;



        if (DEBUG_KEEP_SCREEN_ON && (attrFlags & FLAG_KEEP_SCREEN_ON) != 0

                && w != mService.mLastWakeLockHoldingWindow) {

            Slog.d(TAG_KEEP_SCREEN_ON, "handleNotObscuredLocked: " + w

                    + " has FLAG_KEEP_SCREEN_ON set, hasSurface=" + w.mHasSurface

                    + ", canBeSeen=" + canBeSeen);

        }



        if (w.mHasSurface && canBeSeen) {

            if ((attrFlags & FLAG_KEEP_SCREEN_ON) != 0) {

                mHoldScreen = w.mSession;

                mHoldScreenWindow = w;

            } else if (DEBUG_KEEP_SCREEN_ON && w == mService.mLastWakeLockHoldingWindow) {

                Slog.d(TAG_KEEP_SCREEN_ON, "handleNotObscuredLocked: " + w + " was holding "

                        + "screen wakelock but no longer has FLAG_KEEP_SCREEN_ON!!!");

                        + "screen wakelock but no longer has FLAG_KEEP_SCREEN_ON!!! called by"

                        + Debug.getCallers(10));

            }

            if (!syswin && w.mAttrs.screenBrightness >= 0 && mScreenBrightness < 0) {

                mScreenBrightness = w.mAttrs.screenBrightness;

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

+1 −1
Original line number Diff line number Diff line
@@ -77,5 +77,5 @@ public class WindowManagerDebugConfig { 
    static final boolean DEBUG_UNKNOWN_APP_VISIBILITY = false;



    static final String TAG_KEEP_SCREEN_ON = "DebugKeepScreenOn";

    static final boolean DEBUG_KEEP_SCREEN_ON = true;

    static final boolean DEBUG_KEEP_SCREEN_ON = false;

}