Merge "Handle PHASE_BOOT_COMPLETED asynchronously in LockSettingsService" into main (c40e9a3d) · Commits · e / os / android_frameworks_base

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

+16 −10

Original line number	Diff line number	Diff line
		@@ -369,16 +369,7 @@ public class LockSettingsService extends ILockSettings.Stub {
		@Override
		public void onBootPhase(int phase) {
		super.onBootPhase(phase);
		if (phase == PHASE_ACTIVITY_MANAGER_READY) {
		mLockSettingsService.migrateOldDataAfterSystemReady();
		mLockSettingsService.deleteRepairModePersistentDataIfNeeded();
		} else if (phase == PHASE_BOOT_COMPLETED) {
		// In the case of an upgrade, PHASE_BOOT_COMPLETED means that a rollback to the old
		// build can no longer occur. This is the time to destroy any migrated protectors.
		mLockSettingsService.destroyMigratedProtectors();

		mLockSettingsService.loadEscrowData();
		}
		mLockSettingsService.onBootPhase(phase);
		}

		@Override
		@@ -397,6 +388,21 @@ public class LockSettingsService extends ILockSettings.Stub {
		}
		}

		private void onBootPhase(int phase) {
		if (phase == SystemService.PHASE_ACTIVITY_MANAGER_READY) {
		migrateOldDataAfterSystemReady();
		deleteRepairModePersistentDataIfNeeded();
		} else if (phase == SystemService.PHASE_BOOT_COMPLETED) {
		mHandler.post(() -> {
		// In the case of an upgrade, PHASE_BOOT_COMPLETED means that a rollback to the old
		// build can no longer occur. This is the time to destroy any migrated protectors.
		destroyMigratedProtectors();

		loadEscrowData();
		});
		}
		}

		@VisibleForTesting
		protected static class SynchronizedStrongAuthTracker
		extends LockPatternUtils.StrongAuthTracker {