From cf26667924b5e55f9a49ea58c4eee4dc9fc0315b Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Fri, 30 Jul 2021 12:33:15 -0400
Subject: [PATCH] If keyguard has preferred refresh rate, always use it

Even if we're dozing b/c this # is ignored in low-power mode,
but we still want the display to already be at this refresh
rate when we exit doze.

Test: on device w/ udfps enrolled + preferred refresh rate config,
check dumpsys display when in AOD and check for refresh rate vote
(ie: PRIORITY_APP_REQUEST_REFRESH_RATE_RANGE = preferred rate)
Bug: 192699858
Change-Id: I9ae31e64c4d698eb9e7da46fad5331632b632090
---
 .../statusbar/phone/NotificationShadeWindowControllerImpl.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java
index 5e105bb64350d..246810a2d70be 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java
@@ -296,8 +296,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
 
         if (mKeyguardPreferredRefreshRate > 0) {
             boolean onKeyguard = state.mStatusBarState == StatusBarState.KEYGUARD
-                    && !state.mKeyguardFadingAway && !state.mKeyguardGoingAway
-                    && !state.mDozing;
+                    && !state.mKeyguardFadingAway && !state.mKeyguardGoingAway;
             if (onKeyguard
                     && mAuthController.isUdfpsEnrolled(KeyguardUpdateMonitor.getCurrentUser())) {
                 mLpChanged.preferredMaxDisplayRefreshRate = mKeyguardPreferredRefreshRate;