Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc4219f3 authored by David Anderson's avatar David Anderson Committed by android-build-merger
Browse files

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

am: 442b0947

Change-Id: Ib1a354bed3ad093788a3700532e5d5e874467c37
parents be2b0a71 442b0947

services/core/java/com/android/server/locksettings/PasswordSlotManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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);