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

Commit 29a22951 authored by Eric Biggers's avatar Eric Biggers Committed by Gerrit Code Review
Browse files

Merge "Fix bad merge resolution in LockSettingsService.java" into main

parents 75e8f4f9 2203da82

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -352,7 +352,6 @@ public class LockSettingsService extends ILockSettings.Stub { 
                mLockSettingsService.deleteRepairModePersistentDataIfNeeded();

                mLockSettingsService.deleteRepairModePersistentDataIfNeeded();

            } else if (phase == PHASE_BOOT_COMPLETED) {

            } else if (phase == PHASE_BOOT_COMPLETED) {

                mLockSettingsService.loadEscrowData();

                mLockSettingsService.loadEscrowData();

                mLockSettingsService.deleteRepairModePersistentDataIfNeeded();

            }

            }

        }

        }