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

Commit 06edff9b authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Allow a drawn reported activity to keep screen brightness" am: 8fadd7d0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2608650



Change-Id: I931f02fd837694545df0f0ca6de5fc26eefc07f5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 072daf25 8fadd7d0

services/core/java/com/android/server/wm/RootWindowContainer.java

+11 −14
Original line number Diff line number Diff line
@@ -1046,31 +1046,28 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
     * manager may choose to mirror or blank the display.

     */

    boolean handleNotObscuredLocked(WindowState w, boolean obscured, boolean syswin) {

        final WindowManager.LayoutParams attrs = w.mAttrs;

        final int attrFlags = attrs.flags;

        final boolean onScreen = w.isOnScreen();

        final boolean canBeSeen = w.isDisplayed();

        final int privateflags = attrs.privateFlags;

        boolean displayHasContent = false;



        ProtoLog.d(WM_DEBUG_KEEP_SCREEN_ON,

                "handleNotObscuredLocked w: %s, w.mHasSurface: %b, w.isOnScreen(): %b, w"

                        + ".isDisplayedLw(): %b, w.mAttrs.userActivityTimeout: %d",

                w, w.mHasSurface, onScreen, w.isDisplayed(), w.mAttrs.userActivityTimeout);

        if (w.mHasSurface && onScreen) {

        if (!onScreen) {

            return false;

        }

        if (!syswin && w.mAttrs.userActivityTimeout >= 0 && mUserActivityTimeout < 0) {

            mUserActivityTimeout = w.mAttrs.userActivityTimeout;

            ProtoLog.d(WM_DEBUG_KEEP_SCREEN_ON, "mUserActivityTimeout set to %d",

                    mUserActivityTimeout);

        }

        }

        if (w.mHasSurface && canBeSeen) {

        if (w.isDrawn() || (w.mActivityRecord != null && w.mActivityRecord.firstWindowDrawn

                && w.mActivityRecord.isVisibleRequested())) {

            if (!syswin && w.mAttrs.screenBrightness >= 0

                    && Float.isNaN(mScreenBrightnessOverride)) {

                mScreenBrightnessOverride = w.mAttrs.screenBrightness;

            }



            final int type = attrs.type;

            // This function assumes that the contents of the default display are processed first

            // before secondary displays.

            final DisplayContent displayContent = w.getDisplayContent();
@@ -1084,11 +1081,11 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
                displayHasContent = true;

            } else if (displayContent != null &&

                    (!mObscureApplicationContentOnSecondaryDisplays

                            || (obscured && type == TYPE_KEYGUARD_DIALOG))) {

                            || (obscured && w.mAttrs.type == TYPE_KEYGUARD_DIALOG))) {

                // Allow full screen keyguard presentation dialogs to be seen.

                displayHasContent = true;

            }

            if ((privateflags & PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE) != 0) {

            if ((w.mAttrs.privateFlags & PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE) != 0) {

                mSustainedPerformanceModeCurrent = true;

            }

        }