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

Commit c11befbf authored by Paul Crowley's avatar Paul Crowley Committed by android-build-merger
Browse files

Merge "Send extra argument to unlock_user_keys on non-FBE startup" into nyc-dev am: 99a6c3e6 

am: d7add2bc

* commit 'd7add2bc':
  Send extra argument to unlock_user_keys on non-FBE startup
parents a1c09d4b d7add2bc

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -844,6 +844,7 @@ class MountService extends IMountService.Stub 
            // user directories are locked or unlocked based on the current

            // user directories are locked or unlocked based on the current

            // emulation status.

            // emulation status.

            final boolean initLocked = StorageManager.isEmulatedFileBasedEncryptionEnabled();

            final boolean initLocked = StorageManager.isEmulatedFileBasedEncryptionEnabled();

            Slog.d(TAG, "Setting up emulation state, initlocked=" + initLocked);

            final List<UserInfo> users = mContext.getSystemService(UserManager.class).getUsers();

            final List<UserInfo> users = mContext.getSystemService(UserManager.class).getUsers();

            for (UserInfo user : users) {

            for (UserInfo user : users) {

                try {

                try {
@@ -851,7 +852,7 @@ class MountService extends IMountService.Stub 
                        mCryptConnector.execute("cryptfs", "lock_user_key", user.id);

                        mCryptConnector.execute("cryptfs", "lock_user_key", user.id);

                    } else {

                    } else {

                        mCryptConnector.execute("cryptfs", "unlock_user_key", user.id,

                        mCryptConnector.execute("cryptfs", "unlock_user_key", user.id,

                                user.serialNumber, "!");

                                user.serialNumber, "!", "!");

                    }

                    }

                } catch (NativeDaemonConnectorException e) {

                } catch (NativeDaemonConnectorException e) {

                    Slog.w(TAG, "Failed to init vold", e);

                    Slog.w(TAG, "Failed to init vold", e);