diff options
| author | 2024-01-05 20:29:48 +0000 | |
|---|---|---|
| committer | 2024-01-05 20:29:48 +0000 | |
| commit | fa8341c803fcc3f19da8e2bbddedf22cc39faa53 (patch) | |
| tree | f6851ee880b82cfc2475f4a7ddab1216fbf1d30f | |
| parent | e5d49414df1ed5d4102c830d6c0b322691dce6cb (diff) | |
| parent | 61024bccb161a5f3aee0fb922dd9002a6265709c (diff) | |
Merge "Remove userSerial param from vold methods that don't use it" into main am: 61024bccb1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2873075
Change-Id: Ic6e79c60b16afd7ca5b36a41bf131e0d53285e18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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) { |