From 96c9ea6cc2559feb7983a91d6cef50ebf1b37f18 Mon Sep 17 00:00:00 2001
From: Philip Junker <philipjunker@google.com>
Date: Thu, 29 Dec 2022 17:17:25 +0000
Subject: [PATCH] Don't check wakefulness before setting sandman summoned to
 false.

Bug: 260886786
Change-Id: I5908e4dc5d4cc6d79d2bce71c06302fa634661ed
Test: atest FrameworksServicesTests:PowerManagerServiceTest
---
 .../java/com/android/server/power/PowerManagerService.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 884d5d6aba96c..c29ab09fa3865 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -3229,8 +3229,7 @@ public final class PowerManagerService extends SystemService
             }
             final PowerGroup powerGroup = mPowerGroups.get(groupId);
             wakefulness = powerGroup.getWakefulnessLocked();
-            if ((wakefulness == WAKEFULNESS_DREAMING || wakefulness == WAKEFULNESS_DOZING) &&
-                    powerGroup.isSandmanSummonedLocked() && powerGroup.isReadyLocked()) {
+            if (powerGroup.isSandmanSummonedLocked() && powerGroup.isReadyLocked()) {
                 startDreaming = canDreamLocked(powerGroup) || canDozeLocked(powerGroup);
                 powerGroup.setSandmanSummonedLocked(/* isSandmanSummoned= */ false);
             } else {