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

Commit 178fb273 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow userActivityTimeout override when keyguard is showing." into... 

Merge "Allow userActivityTimeout override when keyguard is showing." into rvc-dev am: 46806c75 am: b5870541 am: 8e1a73cb

Change-Id: I806b17df6e5b1ea17c7fcfcd095bbcb00aa030aa
parents 258daa96 8e1a73cb

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

+5 −2
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ import android.view.ViewRootImpl; 
import android.view.WindowInsets;

import android.view.WindowManager;

import android.view.WindowManagerPolicyConstants.PointerEventListener;

import android.window.ITaskOrganizer;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.MetricsLogger;
@@ -822,8 +823,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 


            if (w.mHasSurface && isDisplayed) {

                final int type = w.mAttrs.type;

                if (type == TYPE_SYSTEM_DIALOG || type == TYPE_SYSTEM_ERROR

                        || mWmService.mPolicy.isKeyguardShowing()) {

                if (type == TYPE_SYSTEM_DIALOG

                        || type == TYPE_SYSTEM_ERROR

                        || (type == TYPE_NOTIFICATION_SHADE

                            &&  mWmService.mPolicy.isKeyguardShowing())) {

                    mTmpApplySurfaceChangesTransactionState.syswin = true;

                }

                if (mTmpApplySurfaceChangesTransactionState.preferredRefreshRate == 0