diff options
| author | 2024-01-05 21:31:46 +0000 | |
|---|---|---|
| committer | 2024-01-05 21:31:46 +0000 | |
| commit | 43cbd48cf00dc296b82b74e56bffbe1b7e1471ac (patch) | |
| tree | 2091ce8cb5247fae4d75843bd0c5d8cf7f4fe473 | |
| parent | 622e7d04eb2d959c2a22ac7ad1b58e1aca3de206 (diff) | |
| parent | 8bbbf603cb8964f7f2d9bbc5b21298e42a64456f (diff) | |
Merge "Remove userSerial param from vold methods that don't use it" into main am: 61024bccb1 am: fa8341c803 am: 8bbbf603cb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2873075
Change-Id: I7ae63f0f01983fc634a99359c15826cb55f0b5bd
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 39b8643e6d38..19a9239752cd 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -3236,7 +3236,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); @@ -3281,7 +3281,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); @@ -3368,7 +3368,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) { |