commit aa26ef9e3ebf92db4e14f6466a65f7c5f62969fc
author Eric Biggers <ebiggers@google.com> Mon Oct 16 23:45:37 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 16 23:45:37 2023 +0000
tree 44d57700c8e8999bf6894c2835a644cff4d1680e
parent 7a176cd49318bb1334394ca844b5054effdc640e
parent 6bb657cfd96413ce8c74fa36752d0bdf01437f30

Merge changes from topic "locksettings-aosp-4" into main am: 5402a800e0 am: 694c075991 am: 3e50c9ea1b am: 6bb657cfd9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2781894

Change-Id: I6770b5edc974fc07f0f14249034b0796b4290476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/locksettings/LockSettingsService.java

diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index f0988f1..f7ef513 100644
--- a/services/core/java/com/android/server/locksettings/LockSettingsService.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -341,8 +341,9 @@
             super.onBootPhase(phase);
             if (phase == PHASE_ACTIVITY_MANAGER_READY) {
                 mLockSettingsService.migrateOldDataAfterSystemReady();
-                mLockSettingsService.loadEscrowData();
                 mLockSettingsService.deleteRepairModePersistentDataIfNeeded();
+            } else if (phase == PHASE_BOOT_COMPLETED) {
+                mLockSettingsService.loadEscrowData();
             }
         }