Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19353b45 authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

Allow to keep screen on only if window can be seen

am: b20addbd

Change-Id: I09e12733e8073814f8d16c3d4025db8f042c2f25
parents fbde1868 b20addbd
Loading
Loading
Loading
Loading
+30 −34
Original line number Diff line number Diff line
@@ -1483,7 +1483,7 @@ class WindowSurfacePlacer {
            mObscured = true;
        }

        if (w.mHasSurface) {
        if (w.mHasSurface && canBeSeen) {
            if ((attrFlags&FLAG_KEEP_SCREEN_ON) != 0) {
                mHoldScreen = w.mSession;
                mHoldScreenWindow = w;
@@ -1506,14 +1506,11 @@ class WindowSurfacePlacer {
            }

            final int type = attrs.type;
            if (canBeSeen
                    && (type == TYPE_SYSTEM_DIALOG
                     || type == TYPE_SYSTEM_ERROR
                     || (attrs.privateFlags & PRIVATE_FLAG_KEYGUARD) != 0)) {
            if (type == TYPE_SYSTEM_DIALOG || type == TYPE_SYSTEM_ERROR
                    || (attrs.privateFlags & PRIVATE_FLAG_KEYGUARD) != 0) {
                mSyswin = true;
            }

            if (canBeSeen) {
            // This function assumes that the contents of the default display are
            // processed first before secondary displays.
            final DisplayContent displayContent = w.getDisplayContent();
@@ -1545,7 +1542,6 @@ class WindowSurfacePlacer {
            }
        }
    }
    }

    private void updateAllDrawnLocked(DisplayContent displayContent) {
        // See if any windows have been drawn, so they (and others