Merge "Send extra argument to unlock_user_keys on non-FBE startup" into nyc-dev (99a6c3e6) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);