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

am: 50a47e61aa

Change-Id: I971a7331aa4c1df805d4875dbe663bd018d3a56e

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

@@ -2879,12 +2879,6 @@ class StorageManagerService extends IStorageManager.Stub
         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));