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

Commit e69cdcc6 authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Automerger Merge Worker
Browse files

Merge "Fix for TestDirectBootEmulated testcase" am: 0bd1e20d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I232e302b1b9ae00a6df5b59102e81bedd0f475d9
parents 5fc7bffd 0bd1e20d

services/core/java/com/android/server/StorageManagerService.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -3297,6 +3297,12 @@ class StorageManagerService extends IStorageManager.Stub 
        enforcePermission(android.Manifest.permission.STORAGE_INTERNAL);

        enforcePermission(android.Manifest.permission.STORAGE_INTERNAL);





        if (isFsEncrypted) {

        if (isFsEncrypted) {

            // When a user has secure lock screen, require secret to actually unlock.

            // This check is mostly in place for emulation mode.

            if (StorageManager.isFileEncryptedEmulatedOnly() &&

                mLockPatternUtils.isSecure(userId) && ArrayUtils.isEmpty(secret)) {

                throw new IllegalStateException("Secret required to unlock secure user " + userId);

            }

            try {

            try {

                mVold.unlockUserKey(userId, serialNumber, encodeBytes(token),

                mVold.unlockUserKey(userId, serialNumber, encodeBytes(token),

                        encodeBytes(secret));

                        encodeBytes(secret));