diff options
| author | 2017-05-30 23:38:13 +0000 | |
|---|---|---|
| committer | 2017-05-30 23:38:19 +0000 | |
| commit | ae532071cf0f07be87bdba1b3af93c59fb7b26c4 (patch) | |
| tree | fd4cfd347e4d494b690ebd48da05996c08b258bd | |
| parent | 844f24dc7ccb3247326af18d0d5cb812cc568f91 (diff) | |
| parent | 133ca972ccecfe0c71ae3dfa9a13cdc85618516a (diff) | |
Merge "Merge "Merge "Temporarily enable screen wakelock logging in WM" into oc-dev am: ea6c7db229" into oc-dev-plus-aosp am: a76bdaf5c7"
| -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, 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<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!!! 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; } |