diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-25 22:09:42 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-01-25 22:09:42 +0000 |
commit | ec568a975c3b916b1557c62fe082c2d67d9b0144 (patch) | |
tree | a0e10a5d2dab713b4ee054d8ae2aff172cc2a6a7 | |
parent | f6e442814abf261be425218323ea2dff075b5a67 (diff) | |
parent | e7ddd1650d811638cd8f12b6c73e3734ecc7e835 (diff) | |
download | base-ec568a975c3b916b1557c62fe082c2d67d9b0144.tar.gz |
Merge "Fix for TestDirectBootEmulated testcase" into android11-tests-dev
-rw-r--r-- | services/core/java/com/android/server/StorageManagerService.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index 678387c540ed..42b821226c49 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -3294,6 +3294,12 @@ class StorageManagerService extends IStorageManager.Stub enforcePermission(android.Manifest.permission.STORAGE_INTERNAL); 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 { mVold.unlockUserKey(userId, serialNumber, encodeBytes(token), encodeBytes(secret)); |