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

Commit 43cbd48c authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Remove userSerial param from vold methods that don't use it" into main... 

Merge "Remove userSerial param from vold methods that don't use it" into main am: 61024bcc am: fa8341c8 am: 8bbbf603

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2873075



Change-Id: I7ae63f0f01983fc634a99359c15826cb55f0b5bd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 622e7d04 8bbbf603

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

+3 −3
Original line number Diff line number Diff line
@@ -3236,7 +3236,7 @@ class StorageManagerService extends IStorageManager.Stub 
        super.createUserStorageKeys_enforcePermission();



        try {

            mVold.createUserStorageKeys(userId, serialNumber, ephemeral);

            mVold.createUserStorageKeys(userId, ephemeral);

            // Since the user's CE key was just created, the user's CE storage is now unlocked.

            synchronized (mLock) {

                mCeUnlockedUsers.append(userId);
@@ -3281,7 +3281,7 @@ class StorageManagerService extends IStorageManager.Stub 
        super.unlockCeStorage_enforcePermission();



        if (StorageManager.isFileEncrypted()) {

            mVold.unlockCeStorage(userId, serialNumber, HexDump.toHexString(secret));

            mVold.unlockCeStorage(userId, HexDump.toHexString(secret));

        }

        synchronized (mLock) {

            mCeUnlockedUsers.append(userId);
@@ -3368,7 +3368,7 @@ class StorageManagerService extends IStorageManager.Stub 
    private void prepareUserStorageInternal(String volumeUuid, int userId, int serialNumber,

            int flags) throws Exception {

        try {

            mVold.prepareUserStorage(volumeUuid, userId, serialNumber, flags);

            mVold.prepareUserStorage(volumeUuid, userId, flags);

            // After preparing user storage, we should check if we should mount data mirror again,

            // and we do it for user 0 only as we only need to do once for all users.

            if (volumeUuid != null) {