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

Commit 47a9d404 authored by Eric Biggers's avatar Eric Biggers
Browse files

Remove serialNumber parameter from prepareUserStorage 

Remove the serialNumber parameter from
IStorageManager#prepareUserStorage, StorageManager#prepareUserStorage,
and StorageManagerService#prepareUserStorageInternal, as it is not used.

Bug: 316035110
Test: atest UserDataPreparerTest
Flag: N/A, mechanical refactoring
Change-Id: I4bb716a502fec267fbe0d93e423c7d713c78feaa
parent 383e31cb

core/java/android/os/storage/IStorageManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ interface IStorageManager { 
    void lockCeStorage(int userId) = 64;

    boolean isCeStorageUnlocked(int userId) = 65;

    @EnforcePermission("STORAGE_INTERNAL")

    void prepareUserStorage(in String volumeUuid, int userId, int serialNumber, int flags) = 66;

    void prepareUserStorage(in String volumeUuid, int userId, int flags) = 66;

    @EnforcePermission("STORAGE_INTERNAL")

    void destroyUserStorage(in String volumeUuid, int userId, int flags) = 67;

    @EnforcePermission("STORAGE_INTERNAL")

core/java/android/os/storage/StorageManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1652,9 +1652,9 @@ public class StorageManager { 
    }



    /** {@hide} */

    public void prepareUserStorage(String volumeUuid, int userId, int serialNumber, int flags) {

    public void prepareUserStorage(String volumeUuid, int userId, int flags) {

        try {

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

            mStorageManager.prepareUserStorage(volumeUuid, userId, flags);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

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

+7 −7
Original line number Diff line number Diff line
@@ -1341,8 +1341,8 @@ class StorageManagerService extends IStorageManager.Stub 


        final int flags = StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE;

        for (UserInfo user : users) {

            prepareUserStorageInternal(fromVolumeUuid, user.id, user.serialNumber, flags);

            prepareUserStorageInternal(toVolumeUuid, user.id, user.serialNumber, flags);

            prepareUserStorageInternal(fromVolumeUuid, user.id, flags);

            prepareUserStorageInternal(toVolumeUuid, user.id, flags);

        }

    }
@@ -3326,25 +3326,25 @@ class StorageManagerService extends IStorageManager.Stub 
                continue;

            }



            prepareUserStorageInternal(vol.fsUuid, user.id, user.serialNumber, flags);

            prepareUserStorageInternal(vol.fsUuid, user.id, flags);

        }

    }



    @android.annotation.EnforcePermission(android.Manifest.permission.STORAGE_INTERNAL)

    @Override

    public void prepareUserStorage(String volumeUuid, int userId, int serialNumber, int flags) {

    public void prepareUserStorage(String volumeUuid, int userId, int flags) {



        super.prepareUserStorage_enforcePermission();



        try {

            prepareUserStorageInternal(volumeUuid, userId, serialNumber, flags);

            prepareUserStorageInternal(volumeUuid, userId, flags);

        } catch (Exception e) {

            throw new RuntimeException(e);

        }

    }



    private void prepareUserStorageInternal(String volumeUuid, int userId, int serialNumber,

            int flags) throws Exception {

    private void prepareUserStorageInternal(String volumeUuid, int userId, int flags)

            throws Exception {

        try {

            mVold.prepareUserStorage(volumeUuid, userId, flags);

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

services/core/java/com/android/server/pm/StorageEventHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ public final class StorageEventHelper extends StorageEventListener { 
            }



            try {

                sm.prepareUserStorage(volumeUuid, user.id, user.serialNumber, flags);

                sm.prepareUserStorage(volumeUuid, user.id, flags);

                synchronized (mPm.mInstallLock) {

                    appDataHelper.reconcileAppsDataLI(volumeUuid, user.id, flags,

                            true /* migrateAppData */);

services/core/java/com/android/server/pm/UserDataPreparer.java

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ class UserDataPreparer { 
                volumeUuid, userId, flags, isNewUser);

        try {

            // Prepare CE and/or DE storage.

            storage.prepareUserStorage(volumeUuid, userId, userSerial, flags);

            storage.prepareUserStorage(volumeUuid, userId, flags);



            // Ensure that the data directories of a removed user with the same ID are not being

            // reused.  New users must get fresh data directories, to avoid leaking data.