From 743fcc11848034c2f87729696913049349d46850 Mon Sep 17 00:00:00 2001 From: Wale Ogunwale Date: Tue, 6 Jun 2017 21:36:50 +0000 Subject: [PATCH] Revert "Temporarily enable screen wakelock logging in WM" This reverts commit efe1b94acd97d6c0c70208d482887de4329ff3de. Bug: 38416971 Change-Id: I6e038d5a24485a5348de8d1558b94a7b5a31bdaf Test: No change in logic --- .../com/android/server/wm/RootWindowContainer.java | 10 ++-------- .../android/server/wm/WindowManagerDebugConfig.java | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index fb500bc256fd7..233e75bbfec70 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -858,20 +858,14 @@ 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!!!"); + + "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; diff --git a/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java b/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java index c080f344c1864..8279b51677660 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 = true; + static final boolean DEBUG_KEEP_SCREEN_ON = false; }