Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wale Ogunwale
2017-06-08 14:33:03 +00:00
committed by Android (Google) Code Review
parent b18f65a168 743fcc1184
commit 13059cc2ad
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -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;

2
services/core/java/com/android/server/wm/WindowManagerDebugConfig.java
View File

@@ -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;
}