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

Commit 41749ebb authored by Eric Biggers's avatar Eric Biggers
Browse files

Remove serialNumber parameter from unlockCeStorage

Remove the serialNumber parameter from IStorageManager#unlockCeStorage,
as it is not used.

Bug: 316035110
Test: atest UserControllerTest
Test: atest com.android.server.locksettings
Flag: N/A, mechanical refactoring
Change-Id: Idfb46e625f0ab6915c980e4a39420fe712cb5fb5
parent 4535627f
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -138,7 +138,7 @@ interface IStorageManager {
    @EnforcePermission("STORAGE_INTERNAL")
    @EnforcePermission("STORAGE_INTERNAL")
    void destroyUserStorageKeys(int userId) = 62;
    void destroyUserStorageKeys(int userId) = 62;
    @EnforcePermission("STORAGE_INTERNAL")
    @EnforcePermission("STORAGE_INTERNAL")
    void unlockCeStorage(int userId, int serialNumber, in byte[] secret) = 63;
    void unlockCeStorage(int userId, in byte[] secret) = 63;
    @EnforcePermission("STORAGE_INTERNAL")
    @EnforcePermission("STORAGE_INTERNAL")
    void lockCeStorage(int userId) = 64;
    void lockCeStorage(int userId) = 64;
    boolean isCeStorageUnlocked(int userId) = 65;
    boolean isCeStorageUnlocked(int userId) = 65;
+1 −2
Original line number Original line Diff line number Diff line
@@ -3255,8 +3255,7 @@ class StorageManagerService extends IStorageManager.Stub
    /* Only for use by LockSettingsService */
    /* Only for use by LockSettingsService */
    @android.annotation.EnforcePermission(android.Manifest.permission.STORAGE_INTERNAL)
    @android.annotation.EnforcePermission(android.Manifest.permission.STORAGE_INTERNAL)
    @Override
    @Override
    public void unlockCeStorage(@UserIdInt int userId, int serialNumber, byte[] secret)
    public void unlockCeStorage(@UserIdInt int userId, byte[] secret) throws RemoteException {
            throws RemoteException {
        super.unlockCeStorage_enforcePermission();
        super.unlockCeStorage_enforcePermission();


        if (StorageManager.isFileEncrypted()) {
        if (StorageManager.isFileEncrypted()) {
+1 −2
Original line number Original line Diff line number Diff line
@@ -2118,11 +2118,10 @@ public class LockSettingsService extends ILockSettings.Stub {
            Slogf.d(TAG, "CE storage for user %d is already unlocked", userId);
            Slogf.d(TAG, "CE storage for user %d is already unlocked", userId);
            return;
            return;
        }
        }
        final UserInfo userInfo = mUserManager.getUserInfo(userId);
        final String userType = isUserSecure(userId) ? "secured" : "unsecured";
        final String userType = isUserSecure(userId) ? "secured" : "unsecured";
        final byte[] secret = sp.deriveFileBasedEncryptionKey();
        final byte[] secret = sp.deriveFileBasedEncryptionKey();
        try {
        try {
            mStorageManager.unlockCeStorage(userId, userInfo.serialNumber, secret);
            mStorageManager.unlockCeStorage(userId, secret);
            Slogf.i(TAG, "Unlocked CE storage for %s user %d", userType, userId);
            Slogf.i(TAG, "Unlocked CE storage for %s user %d", userType, userId);
        } catch (RemoteException e) {
        } catch (RemoteException e) {
            Slogf.wtf(TAG, e, "Failed to unlock CE storage for %s user %d", userType, userId);
            Slogf.wtf(TAG, e, "Failed to unlock CE storage for %s user %d", userType, userId);
+1 −2
Original line number Original line Diff line number Diff line
@@ -756,8 +756,7 @@ public class UserControllerTest {


        mUserController.startUser(TEST_USER_ID, USER_START_MODE_BACKGROUND);
        mUserController.startUser(TEST_USER_ID, USER_START_MODE_BACKGROUND);


        verify(mInjector.mStorageManagerMock, never())
        verify(mInjector.mStorageManagerMock, never()).unlockCeStorage(eq(TEST_USER_ID), any());
                .unlockCeStorage(eq(TEST_USER_ID), anyInt(), any());
    }
    }


    @Test
    @Test
+2 −2
Original line number Original line Diff line number Diff line
@@ -305,9 +305,9 @@ public abstract class BaseLockSettingsServiceTests {
        doAnswer(invocation -> {
        doAnswer(invocation -> {
            Object[] args = invocation.getArguments();
            Object[] args = invocation.getArguments();
            mStorageManager.unlockCeStorage(/* userId= */ (int) args[0],
            mStorageManager.unlockCeStorage(/* userId= */ (int) args[0],
                    /* secret= */ (byte[]) args[2]);
                    /* secret= */ (byte[]) args[1]);
            return null;
            return null;
        }).when(sm).unlockCeStorage(anyInt(), anyInt(), any());
        }).when(sm).unlockCeStorage(anyInt(), any());


        doAnswer(invocation -> {
        doAnswer(invocation -> {
            Object[] args = invocation.getArguments();
            Object[] args = invocation.getArguments();