| commit | 593713cc77274c87c63e1f5292fccff918a74f57 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Thu Oct 31 16:56:28 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 31 16:56:28 2024 +0000 |
| tree | 1f0d7a7d90c066d49de92038ec646e40efbf82e1 | |
| parent | e21f57c323b350511e8f6c9ca7f0df1e74612f32 [diff] | |
| parent | daf1167eec369e6a82d327ff7f7d8aaff6cd5d2c [diff] |
Merge "Throw exception if SP cannot be unwrapped during migration" into main am: daf1167eec Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3325957 Change-Id: I336c2c8cc9954dccec284293d686321bd7d86824 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index 8798a64..9b77a08 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -1219,8 +1219,8 @@ Slog.i(TAG, "Synthetic password is already not protected by Weaver"); } } else if (sp == null) { - Slogf.wtf(TAG, "Failed to unwrap synthetic password for unsecured user %d", userId); - return; + throw new IllegalStateException( + "Failed to unwrap synthetic password for unsecured user " + userId); } // Call setCeStorageProtection(), to re-encrypt the CE key with the SP if it's currently