Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d94ab731 authored by Paul Crowley's avatar Paul Crowley
Browse files

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
parent 3dbcd203

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);