diff options
author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2021-01-26 05:07:15 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-01-26 05:07:15 +0000 |
commit | 8c73db9d658a15f67727b2bb066b01dfe8ba9adb (patch) | |
tree | a0e10a5d2dab713b4ee054d8ae2aff172cc2a6a7 | |
parent | 6abbb55c5218d165a8de4a750154dc83e998b53c (diff) | |
parent | 8f641e1e193a64800697057321fa4f3971e3562a (diff) | |
download | base-8c73db9d658a15f67727b2bb066b01dfe8ba9adb.tar.gz |
Merge "Snap for 7102722 from ec568a975c3b916b1557c62fe082c2d67d9b0144 to android11-tests-release" into android11-tests-releaseandroid-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-cts-11.0_r5android-cts-11.0_r4
-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)); |