From 921ec3a90316e7343941f1cfab9ca0ab6c19ee68 Mon Sep 17 00:00:00 2001
From: Philip Junker <philipjunker@google.com>
Date: Tue, 10 Jan 2023 14:18:13 +0000
Subject: [PATCH] Don't check wakefulness before setting sandman summoned to
 false.

Bug: 260886786
Test: atest FrameworksServicesTests:PowerManagerServiceTest
Merged-In: I5908e4dc5d4cc6d79d2bce71c06302fa634661ed
Change-Id: I677c339217edaf61f4af64810836dcd3dd31fd60
---
 .../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 ed4ba0d0eacd2..7f8f40626c565 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -3202,8 +3202,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 {