summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2024-09-18 19:00:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-09-18 19:00:57 +0000
commitd117465e3cd4efdc5e5f4502a68f3e5f80feb5a2 (patch)
tree1f4edb05ebb6f9ca4db6a87072ea6c5d0ecce371
parent875b2ec31fb65528dd3e10df6b44fc72c80e2c72 (diff)
parent9c887e08a87aa92cac384468475eb8dabf77fccc (diff)
Merge "LockSettingsStorage: don't ignore insertion exceptions" into main am: 9c887e08a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3269677 Change-Id: Ia5e5a72803b3371029891333ced3a60771c3e6e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/locksettings/LockSettingsStorage.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/locksettings/LockSettingsStorage.java b/services/core/java/com/android/server/locksettings/LockSettingsStorage.java
index 158d444bcff2..1e25f1cf1d5e 100644
--- a/services/core/java/com/android/server/locksettings/LockSettingsStorage.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsStorage.java
@@ -140,7 +140,7 @@ class LockSettingsStorage {
try {
db.delete(TABLE, COLUMN_KEY + "=? AND " + COLUMN_USERID + "=?",
new String[] {key, Integer.toString(userId)});
- db.insert(TABLE, null, cv);
+ db.insertOrThrow(TABLE, null, cv);
db.setTransactionSuccessful();
mCache.putKeyValue(key, value, userId);
} finally {