Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1613228 authored by Eric Biggers's avatar Eric Biggers
Browse files

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
parent 80dc077c

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

+1 −2
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ import static android.os.PowerExemptionManager.REASON_ACTIVITY_VISIBILITY_GRACE_ 
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 @@ public class ActivityManagerService extends IActivityManager.Stub 
                    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);

        }