From 2f809b0b7d427fd14c74adccfab704baac915a52 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@google.com>
Date: Fri, 12 Jul 2019 18:41:19 -0700
Subject: [PATCH] PasswordSlotManager: Fix incorrect string comparison.

Bug: 135721162
Test: cts-on-gsi -m CtsWindowManagerDeviceTestCases
Change-Id: I2a11dd6dfd44e10400e40ebbaa2ed597de95cdcb
Merged-In: I2a11dd6dfd44e10400e40ebbaa2ed597de95cdcb
---
 .../com/android/server/locksettings/PasswordSlotManager.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/locksettings/PasswordSlotManager.java b/services/core/java/com/android/server/locksettings/PasswordSlotManager.java
index 5cbd237a0722e..4ef63c05325c4 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);