Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always ask vold to unlock user"

Browse Source 
am: 62cec10872

Change-Id: I7d51d3cc8b576b18884f4a1822e0dcf14a4db769
This commit is contained in:
Nikita Ioffe
2019-11-23 04:28:47 -08:00
committed by android-build-merger
parent 28ee420e5c 62cec10872
commit e30f164dcc
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -2803,12 +2803,6 @@ class StorageManagerService extends IStorageManager.Stub
enforcePermission(android.Manifest.permission.STORAGE_INTERNAL); enforcePermission(android.Manifest.permission.STORAGE_INTERNAL);
if (StorageManager.isFileEncryptedNativeOrEmulated()) { 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 { try {
mVold.unlockUserKey(userId, serialNumber, encodeBytes(token), mVold.unlockUserKey(userId, serialNumber, encodeBytes(token),
encodeBytes(secret)); encodeBytes(secret));