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

Commit 3e50c9ea authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge changes from topic "locksettings-aosp-4" into main am: 5402a800 am: 694c0759 

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



Change-Id: If1ca8c3c6869d52797354557fcd63e8831261a00
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3ae5657e 694c0759

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

+2 −1
Original line number Diff line number Diff line
@@ -341,8 +341,9 @@ public class LockSettingsService extends ILockSettings.Stub { 
            super.onBootPhase(phase);

            if (phase == PHASE_ACTIVITY_MANAGER_READY) {

                mLockSettingsService.migrateOldDataAfterSystemReady();

                mLockSettingsService.loadEscrowData();

                mLockSettingsService.deleteRepairModePersistentDataIfNeeded();

            } else if (phase == PHASE_BOOT_COMPLETED) {

                mLockSettingsService.loadEscrowData();

            }

        }