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

Commit fe1a2773 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "LockSettingsStorage: don't ignore insertion exceptions" into main am:... 

Merge "LockSettingsStorage: don't ignore insertion exceptions" into main am: 9c887e08 am: d117465e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3269677



Change-Id: Ieb254621972c8591dec3150eea1bc2ddba8022fa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e5231d33 d117465e

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -140,7 +140,7 @@ class LockSettingsStorage { 
        try {

        try {

            db.delete(TABLE, COLUMN_KEY + "=? AND " + COLUMN_USERID + "=?",

            db.delete(TABLE, COLUMN_KEY + "=? AND " + COLUMN_USERID + "=?",

                    new String[] {key, Integer.toString(userId)});

                    new String[] {key, Integer.toString(userId)});

            db.insert(TABLE, null, cv);

            db.insertOrThrow(TABLE, null, cv);

            db.setTransactionSuccessful();

            db.setTransactionSuccessful();

            mCache.putKeyValue(key, value, userId);

            mCache.putKeyValue(key, value, userId);

        } finally {

        } finally {