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

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

Merge "Throw exception if SP cannot be unwrapped during migration" into main... 

Merge "Throw exception if SP cannot be unwrapped during migration" into main am: daf1167e am: 593713cc

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



Change-Id: I0cd1c33c54df88cebcea93537692ce60c58e8dce
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7078650b 593713cc

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

+2 −2
Original line number Diff line number Diff line
@@ -1219,8 +1219,8 @@ public class LockSettingsService extends ILockSettings.Stub { 
                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