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

Commit 383e31cb authored by Eric Biggers's avatar Eric Biggers
Browse files

Remove serialNumber parameter from createUserStorageKeys 

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

Bug: 316035110
Test: presubmit
Flag: N/A, mechanical refactoring
Change-Id: I11f2507fefb374bea7c8de857424c67108fcb97e
parent 41749ebb

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

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ interface IStorageManager { 
    @EnforcePermission("MOUNT_UNMOUNT_FILESYSTEMS")

    void setDebugFlags(int flags, int mask) = 60;

    @EnforcePermission("STORAGE_INTERNAL")

    void createUserStorageKeys(int userId, int serialNumber, boolean ephemeral) = 61;

    void createUserStorageKeys(int userId, boolean ephemeral) = 61;

    @EnforcePermission("STORAGE_INTERNAL")

    void destroyUserStorageKeys(int userId) = 62;

    @EnforcePermission("STORAGE_INTERNAL")

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

+2 −3
Original line number Diff line number Diff line
@@ -1602,14 +1602,13 @@ public class StorageManager { 
     * This is only intended to be called by UserManagerService, as part of creating a user.

     *

     * @param userId ID of the user

     * @param serialNumber serial number of the user

     * @param ephemeral whether the user is ephemeral

     * @throws RuntimeException on error.  The user's keys already existing is considered an error.

     * @hide

     */

    public void createUserStorageKeys(int userId, int serialNumber, boolean ephemeral) {

    public void createUserStorageKeys(int userId, boolean ephemeral) {

        try {

            mStorageManager.createUserStorageKeys(userId, serialNumber, ephemeral);

            mStorageManager.createUserStorageKeys(userId, ephemeral);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

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

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


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

    @Override

    public void createUserStorageKeys(int userId, int serialNumber, boolean ephemeral) {

    public void createUserStorageKeys(int userId, boolean ephemeral) {



        super.createUserStorageKeys_enforcePermission();

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

+1 −1
Original line number Diff line number Diff line
@@ -4920,7 +4920,7 @@ public class UserManagerService extends IUserManager.Stub { 


            t.traceBegin("createUserStorageKeys");

            final StorageManager storage = mContext.getSystemService(StorageManager.class);

            storage.createUserStorageKeys(userId, userInfo.serialNumber, userInfo.isEphemeral());

            storage.createUserStorageKeys(userId, userInfo.isEphemeral());

            t.traceEnd();



            // Only prepare DE storage here.  CE storage will be prepared later, when the user is