diff options
| author | 2019-07-12 18:41:19 -0700 | |
|---|---|---|
| committer | 2019-07-15 18:02:11 -0700 | |
| commit | d1552e36f4aa20ac240e2d72ae26f30e51f03787 (patch) | |
| tree | 5df68840a7e7bf57ad44daec77e66c3c05507d54 | |
| parent | bc841b029311400ef2602bafe9b3776310d5e8a7 (diff) | |
PasswordSlotManager: Fix incorrect string comparison.
Bug: 135721162
Test: cts-on-gsi -m CtsWindowManagerDeviceTestCases
Change-Id: I2a11dd6dfd44e10400e40ebbaa2ed597de95cdcb
Merged-In: I2a11dd6dfd44e10400e40ebbaa2ed597de95cdcb
| -rw-r--r-- | services/core/java/com/android/server/locksettings/PasswordSlotManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/locksettings/PasswordSlotManager.java b/services/core/java/com/android/server/locksettings/PasswordSlotManager.java index 5cbd237a0722..4ef63c05325c 100644 --- a/services/core/java/com/android/server/locksettings/PasswordSlotManager.java +++ b/services/core/java/com/android/server/locksettings/PasswordSlotManager.java @@ -122,7 +122,7 @@ public class PasswordSlotManager { */ public void markSlotDeleted(int slot) throws RuntimeException { 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"); } mSlotMap.remove(slot); |