From efe1b94acd97d6c0c70208d482887de4329ff3de Mon Sep 17 00:00:00 2001 From: Andrii Kulian Date: Fri, 26 May 2017 14:51:47 -0700 Subject: Temporarily enable screen wakelock logging in WM Enable DEBUG_KEEP_SCREEN_ON flag to get additional wakelock logs to investigate b/38416971. Bug: 38416971 Test: No change in logic Change-Id: I83c45a26befb6a767b5d9fc30b1cde07a2432ebe --- .../core/java/com/android/server/wm/RootWindowContainer.java | 10 ++++++++-- .../java/com/android/server/wm/WindowManagerDebugConfig.java | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 233e75bbfec7..fb500bc256fd 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -858,14 +858,20 @@ class RootWindowContainer extends WindowContainer { 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!!! called by" - + Debug.getCallers(10)); + + "screen wakelock but no longer has FLAG_KEEP_SCREEN_ON!!!"); } if (!syswin && w.mAttrs.screenBrightness >= 0 && mScreenBrightness < 0) { mScreenBrightness = w.mAttrs.screenBrightness; diff --git a/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java b/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java index 8279b5167766..c080f344c186 100644 --- a/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java +++ b/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java @@ -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 = false; + static final boolean DEBUG_KEEP_SCREEN_ON = true; } -- cgit v1.2.3-59-g8ed1b