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

Skip to content
Commit 2203da82 authored by Eric Biggers's avatar Eric Biggers
Browse files

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
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment