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

Merge "Send extra argument to unlock_user_keys on non-FBE startup" into nyc-dev

Browse Source
This commit is contained in:
Paul Crowley
2016-02-15 14:04:04 +00:00
committed by Android (Google) Code Review
parent 7c2d8e011a d94ab73152
commit 99a6c3e6d9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/MountService.java
View File

@@ -844,6 +844,7 @@ class MountService extends IMountService.Stub
// user directories are locked or unlocked based on the current
// emulation status.
final boolean initLocked = StorageManager.isEmulatedFileBasedEncryptionEnabled();
Slog.d(TAG, "Setting up emulation state, initlocked=" + initLocked);
final List<UserInfo> users = mContext.getSystemService(UserManager.class).getUsers();
for (UserInfo user : users) {
try {
@@ -851,7 +852,7 @@ class MountService extends IMountService.Stub
mCryptConnector.execute("cryptfs", "lock_user_key", user.id);
} else {
mCryptConnector.execute("cryptfs", "unlock_user_key", user.id,
user.serialNumber, "!");
user.serialNumber, "!", "!");
}
} catch (NativeDaemonConnectorException e) {
Slog.w(TAG, "Failed to init vold", e);