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

PasswordSlotManager: Fix incorrect string comparison.

Browse Source 
Bug: 135721162
Test: cts-on-gsi -m CtsWindowManagerDeviceTestCases
Change-Id: I2a11dd6dfd44e10400e40ebbaa2ed597de95cdcb
Merged-In: I2a11dd6dfd44e10400e40ebbaa2ed597de95cdcb
This commit is contained in:
David Anderson
2019-07-12 18:41:19 -07:00
parent bc841b0293
commit d1552e36f4
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);