From 0c090460fc95068ef9ada7224f0d4222d2400951 Mon Sep 17 00:00:00 2001
From: Robin Lee <rgl@google.com>
Date: Thu, 17 Jun 2021 13:07:11 +0200
Subject: [PATCH] WakefulenessLifecycle: start out as AWAKE for NFFs

WakefulessLifecycle is driven by KeyguardService, which doesn't always
exist. When it doesn't exist, mWakefulness will remain set to
WAKEFULNESS_ASLEEP, which prevents some UI bits from showing up. The
most important one to fix is VolumeDialogControllerImpl.

We also need to set the default value of mDeviceInteractive to true
since the callback will never come on a device without a keyguard
service.

Test: atest SystemUITests
Fix: 190357428
Change-Id: Ib4f67e756c9549d919ec8ae640abca044d7d651f
---
 .../src/com/android/systemui/keyguard/WakefulnessLifecycle.java | 2 +-
 .../com/android/systemui/volume/VolumeDialogControllerImpl.java | 2 +-
 .../com/android/systemui/keyguard/WakefulnessLifecycleTest.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java b/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java
index 2e03d9a90f49f..6f878d19aa4bf 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java
@@ -67,7 +67,7 @@ public class WakefulnessLifecycle extends Lifecycle<WakefulnessLifecycle.Observe
     @Nullable
     private final IWallpaperManager mWallpaperManagerService;
 
-    private int mWakefulness = WAKEFULNESS_ASLEEP;
+    private int mWakefulness = WAKEFULNESS_AWAKE;
 
     private @PowerManager.WakeReason int mLastWakeReason = PowerManager.WAKE_REASON_UNKNOWN;
 
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java
index a5ccc47b8072d..ab4b1f10132c8 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java
@@ -135,7 +135,7 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
     private boolean mShowVolumeDialog;
     private boolean mShowSafetyWarning;
     private long mLastToggledRingerOn;
-    private boolean mDeviceInteractive;
+    private boolean mDeviceInteractive = true;
 
     private boolean mDestroyed;
     private VolumePolicy mVolumePolicy;
diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/WakefulnessLifecycleTest.java b/packages/SystemUI/tests/src/com/android/systemui/keyguard/WakefulnessLifecycleTest.java
index 63ce98a170a6d..910b381053328 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/WakefulnessLifecycleTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/WakefulnessLifecycleTest.java
@@ -56,7 +56,7 @@ public class WakefulnessLifecycleTest extends SysuiTestCase {
 
     @Test
     public void baseState() throws Exception {
-        assertEquals(WakefulnessLifecycle.WAKEFULNESS_ASLEEP, mWakefulness.getWakefulness());
+        assertEquals(WakefulnessLifecycle.WAKEFULNESS_AWAKE, mWakefulness.getWakefulness());
 
         verifyNoMoreInteractions(mWakefulnessObserver);
     }