From d94ab7315298f4e05e967198bcfca72075e2b14d Mon Sep 17 00:00:00 2001 From: Paul Crowley Date: Mon, 15 Feb 2016 06:44:51 +0000 Subject: [PATCH] Send extra argument to unlock_user_keys on non-FBE startup Non-FBE startup has a loop which sets up the appropriate lock state for each user depending on whether FBE is being emulated; this loop calls unlock_user_keys when emulation is off. I didn't modify this loop when adding the extra arguemnt to unlock_user_keys. Bug: 27155768 Change-Id: I825a61552383552eafb88c77c1f30591bdfd077c --- services/core/java/com/android/server/MountService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java index d09edc88ae8a3..53923ba972c71 100644 --- a/services/core/java/com/android/server/MountService.java +++ b/services/core/java/com/android/server/MountService.java @@ -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 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);