| commit | c08f3a30764e00958e72156dd5fd25a60503e6cf | [log] [tgz] |
|---|---|---|
| author | David Anderson <dvander@google.com> | Fri Jul 12 18:41:19 2019 -0700 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Fri Jul 19 03:40:59 2019 +0000 |
| tree | b8e7903678767b626828c3158d8d8b6a3d871fc9 | |
| parent | 00d5eb2d4ac963e83c6901e2e607decd41d6f207 [diff] |
PasswordSlotManager: Fix incorrect string comparison. Bug: 135721162 Test: cts-on-gsi -m CtsWindowManagerDeviceTestCases Change-Id: I2a11dd6dfd44e10400e40ebbaa2ed597de95cdcb Merged-In: I2a11dd6dfd44e10400e40ebbaa2ed597de95cdcb (cherry picked from commit 2f809b0b7d427fd14c74adccfab704baac915a52)
diff --git a/services/core/java/com/android/server/locksettings/PasswordSlotManager.java b/services/core/java/com/android/server/locksettings/PasswordSlotManager.java index 5cbd237..4ef63c0 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 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);