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

Merge "Allow to keep screen on only if window can be seen" into nyc-mr1-dev

Browse Source
This commit is contained in:
Chong Zhang
2016-08-12 00:42:56 +00:00
committed by Android (Google) Code Review
parent f36d81038a b20addbdfb
commit 305d610fd8
1 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1483,7 +1483,7 @@ class WindowSurfacePlacer {
mObscured = true; mObscured = true;
} }
if (w.mHasSurface) { if (w.mHasSurface && canBeSeen) {
if ((attrFlags&FLAG_KEEP_SCREEN_ON) != 0) { if ((attrFlags&FLAG_KEEP_SCREEN_ON) != 0) {
mHoldScreen = w.mSession; mHoldScreen = w.mSession;
mHoldScreenWindow = w; mHoldScreenWindow = w;
@@ -1506,14 +1506,11 @@ class WindowSurfacePlacer {
} }
final int type = attrs.type; final int type = attrs.type;
if (canBeSeen if (type == TYPE_SYSTEM_DIALOG || type == TYPE_SYSTEM_ERROR
&& (type == TYPE_SYSTEM_DIALOG || (attrs.privateFlags & PRIVATE_FLAG_KEYGUARD) != 0) {
|| type == TYPE_SYSTEM_ERROR
|| (attrs.privateFlags & PRIVATE_FLAG_KEYGUARD) != 0)) {
mSyswin = true; mSyswin = true;
} }
if (canBeSeen) {
// This function assumes that the contents of the default display are // This function assumes that the contents of the default display are
// processed first before secondary displays. // processed first before secondary displays.
final DisplayContent displayContent = w.getDisplayContent(); final DisplayContent displayContent = w.getDisplayContent();
@@ -1545,7 +1542,6 @@ class WindowSurfacePlacer {
} }
} }
} }
}
private void updateAllDrawnLocked(DisplayContent displayContent) { private void updateAllDrawnLocked(DisplayContent displayContent) {
// See if any windows have been drawn, so they (and others // See if any windows have been drawn, so they (and others