Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "PasswordSlotManager: Fix incorrect string comparison." into qt-dev

Browse Source
This commit is contained in:
David Anderson
2019-07-18 17:00:25 +00:00
committed by Android (Google) Code Review
parent 378702d8a4 2f809b0b7d
commit 442b09472d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/locksettings/PasswordSlotManager.java
View File

@@ -122,7 +122,7 @@ public class PasswordSlotManager {
*/ */
public void markSlotDeleted(int slot) throws RuntimeException { public void markSlotDeleted(int slot) throws RuntimeException {
ensureSlotMapLoaded(); ensureSlotMapLoaded();
if (mSlotMap.containsKey(slot) && mSlotMap.get(slot) != getMode()) { if (mSlotMap.containsKey(slot) && !mSlotMap.get(slot).equals(getMode())) {
throw new RuntimeException("password slot " + slot + " cannot be deleted"); throw new RuntimeException("password slot " + slot + " cannot be deleted");
} }
mSlotMap.remove(slot); mSlotMap.remove(slot);