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

Merge "Merge "Temporarily enable screen wakelock logging in WM" into oc-dev am: ea6c7db229" into oc-dev-plus-aosp

Browse Source 
am: a76bdaf5c7

Change-Id: I46ce27d67ff21341079cf3e449d531a7041d97a6
This commit is contained in:
Andrii Kulian
2017-05-30 23:36:36 +00:00
committed by android-build-merger
parent 28eec81d75 a76bdaf5c7
commit 133ca972cc
2 changed files with 9 additions and 3 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,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;

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 = false;
static final boolean DEBUG_KEEP_SCREEN_ON = true;
}