Commit 2203da82 authored Dec 12, 2023 by Eric Biggers

Fix bad merge resolution in LockSettingsService.java

The merge commit 8a5dadb7 (http://ag/25090532) duplicated the line
'mLockSettingsService.deleteRepairModePersistentDataIfNeeded();'.
Fix this to make AOSP main match internal main.

Test: atest com.android.server.locksettings
Change-Id: I8e4326c33b715bc6a1fef7dbf6ce53cd69c1b93a

parent 91755c24

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -352,7 +352,6 @@ public class LockSettingsService extends ILockSettings.Stub {
		mLockSettingsService.deleteRepairModePersistentDataIfNeeded();
		} else if (phase == PHASE_BOOT_COMPLETED) {
		mLockSettingsService.loadEscrowData();
		mLockSettingsService.deleteRepairModePersistentDataIfNeeded();
		}
		}