commit e30f164dcccc782cbb4bf918a47dfa444bae4e1e
author Nikita Ioffe <ioffe@google.com> Sat Nov 23 04:28:47 2019 -0800
committer android-build-merger <android-build-merger@google.com> Sat Nov 23 04:28:47 2019 -0800
tree 461b484d0a1eb6b87d9623fa0dac0289192bd47a
parent 28ee420e5c1fe1ce82a2bec1d15d8c52fb036a1e
parent 62cec10872514e682edf8c25a506e0970e299ea7

Merge "Always ask vold to unlock user"
am: 62cec10872

Change-Id: I7d51d3cc8b576b18884f4a1822e0dcf14a4db769

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

diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 9693585..d1bc6af 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -2803,12 +2803,6 @@
         enforcePermission(android.Manifest.permission.STORAGE_INTERNAL);
 
         if (StorageManager.isFileEncryptedNativeOrEmulated()) {
-            // When a user has secure lock screen, require secret to actually unlock.
-            // This check is mostly in place for emulation mode.
-            if (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));