diff options
| author | 2017-06-08 14:33:03 +0000 | |
|---|---|---|
| committer | 2017-06-08 14:33:10 +0000 | |
| commit | 13059cc2ad427e4247b4f6e81f854de33d59b9cd (patch) | |
| tree | cbf3887eb1abb41d682c9c477b2ed29aa62af8f6 | |
| parent | b18f65a1686be187e9a250d5d47b593fe589475a (diff) | |
| parent | 743fcc11848034c2f87729696913049349d46850 (diff) | |
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
| -rw-r--r-- | services/core/java/com/android/server/wm/RootWindowContainer.java | 10 | ||||
| -rw-r--r-- | services/core/java/com/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 fb500bc256fd..233e75bbfec7 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<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; diff --git a/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java b/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java index 4da9c060fc4d..6d5673e283d8 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; } |