commit f1613228a73d2f4c9b1eea79538f1a30566a99c4
author Eric Biggers <ebiggers@google.com> Thu Nov 16 22:39:21 2023 +0000
committer Eric Biggers <ebiggers@google.com> Fri Nov 17 02:39:58 2023 +0000
tree 0b81bbe64c5a1f50395a4eff34f24f3a0bf31ad2
parent 80dc077c82a400f0ed3dc6dedf475957b2fe34dc

Use isCeStorageUnlocked() in AMS.maybeSendBootCompletedLocked()

isUserKeyUnlocked() is being renamed to isCeStorageUnlocked() to make it
clear what it does (considering that there are many types of user keys).
Temporarily, the method exists under both names.  Change
ActivityManagerService#maybeSendBootCompletedLocked() to use the new
name.  No change in behavior.

Bug: 306204742
Flag: exempt, mechanical refactoring
Test: presubmit
Ignore-AOSP-First: code was added by ag/25096398, not in AOSP yet
Change-Id: I977d213854ee0bd047b65cdc96dcab5ce3396701

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index b2a7948..618b9d3 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -79,7 +79,6 @@
 import static android.os.PowerExemptionManager.REASON_BACKGROUND_ACTIVITY_PERMISSION;
 import static android.os.PowerExemptionManager.REASON_BOOT_COMPLETED;
 import static android.os.PowerExemptionManager.REASON_COMPANION_DEVICE_MANAGER;
-import static android.os.PowerExemptionManager.REASON_DENIED;
 import static android.os.PowerExemptionManager.REASON_INSTR_BACKGROUND_ACTIVITY_PERMISSION;
 import static android.os.PowerExemptionManager.REASON_LOCKED_BOOT_COMPLETED;
 import static android.os.PowerExemptionManager.REASON_PROC_STATE_BTOP;
@@ -5048,7 +5047,7 @@
                     REASON_LOCKED_BOOT_COMPLETED);
         }
         // Send BOOT_COMPLETED if the user is unlocked
-        if (StorageManager.isUserKeyUnlocked(app.userId)) {
+        if (StorageManager.isCeStorageUnlocked(app.userId)) {
             sendBootBroadcastToAppLocked(app, new Intent(Intent.ACTION_BOOT_COMPLETED),
                     REASON_BOOT_COMPLETED);
         }