diff options
| author | 2023-12-13 00:02:56 +0000 | |
|---|---|---|
| committer | 2024-01-04 22:39:40 +0000 | |
| commit | a4f73ae8d3d47e2778884da2fe589845bed13b1c (patch) | |
| tree | 5a75c261165adda06339b73a49523d3e63a8554a | |
| parent | 2195d3d78d259fef40fc08fb3b2b224f02d1dbe4 (diff) | |
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
| -rw-r--r-- | services/core/java/com/android/server/StorageManagerService.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index 1595a3538201..490aa1f3144c 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -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) { |