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

Commit a4f73ae8 authored by Eric Biggers's avatar Eric Biggers
Browse files

Remove userSerial param from vold methods that don't use it 

The userSerial parameter is being removed from the vold methods that
don't use it.  Update the callers accordingly.

Note: later CLs will remove the serialNumber parameter from methods in
StorageManagerService too.  This CL simply updates the calls to vold.

Bug: 316035110
Test: presubmit
Flag: N/A, mechanical refactoring
Change-Id: Ide5397693d594e0b1fad81c031e3c9190fd0bdde
parent 2195d3d7

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

+3 −3
Original line number Diff line number Diff line
@@ -3215,7 +3215,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);
@@ -3260,7 +3260,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);
@@ -3347,7 +3347,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) {