diff options
| author | 2023-12-12 23:23:47 +0000 | |
|---|---|---|
| committer | 2023-12-12 23:35:44 +0000 | |
| commit | 2203da828c35aa91316cc6b8400f592d0a2fdc9e (patch) | |
| tree | 6bb9ea271ccbf6321c861b9212cbf8e6e5d7dd4a /api/coverage/tools | |
| parent | 91755c24d0d4f74a8a86a6614b2136c4eb42111c (diff) | |
Fix bad merge resolution in LockSettingsService.java
The merge commit 8a5dadb79051 (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
Diffstat (limited to 'api/coverage/tools')
0 files changed, 0 insertions, 0 deletions