commit a5a468c4315d930157354bc5e84d035218d1b78a
author Eric Biggers <ebiggers@google.com> Tue Dec 12 23:53:55 2023 +0000
committer Eric Biggers <ebiggers@google.com> Thu Jan 04 22:39:43 2024 +0000
tree 54f3440e1d2a703daf7e843f8eb5430b7aa63e6f
parent 69c4d769edc55d165b7646a0b8173165a8c7f62e

Remove userSerial param from vold methods that don't use it

createUserStorageKeys(), unlockCeStorage(), and prepareUserStorage()
have a user serial number parameter, but they don't actually do anything
with it except log it.  Remove this unnecessary parameter.

Bug: 316035110
Test: presubmit
Flag: N/A, mechanical refactoring
Change-Id: I73ebae1afb2bdb7ca856b40b34ce806fdda718fe

VoldNativeService.h

diff --git a/VoldNativeService.h b/VoldNativeService.h
index e98aea8..d9aee57 100644
--- a/VoldNativeService.h
+++ b/VoldNativeService.h
@@ -112,17 +112,17 @@
 
     binder::Status setStorageBindingSeed(const std::vector<uint8_t>& seed);
 
-    binder::Status createUserStorageKeys(int32_t userId, int32_t userSerial, bool ephemeral);
+    binder::Status createUserStorageKeys(int32_t userId, bool ephemeral);
     binder::Status destroyUserStorageKeys(int32_t userId);
 
     binder::Status setCeStorageProtection(int32_t userId, const std::string& secret);
 
     binder::Status getUnlockedUsers(std::vector<int>* _aidl_return);
-    binder::Status unlockCeStorage(int32_t userId, int32_t userSerial, const std::string& secret);
+    binder::Status unlockCeStorage(int32_t userId, const std::string& secret);
     binder::Status lockCeStorage(int32_t userId);
 
     binder::Status prepareUserStorage(const std::optional<std::string>& uuid, int32_t userId,
-                                      int32_t userSerial, int32_t flags);
+                                      int32_t flags);
     binder::Status destroyUserStorage(const std::optional<std::string>& uuid, int32_t userId,
                                       int32_t flags);