commit ae783446235164548f66082a00bbf734a396f11b
author Yurii Zubrytskyi <zyy@google.com> Thu Mar 26 04:25:24 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 26 04:25:24 2020 +0000
tree 282efe9f417b730c2c2739f75939285f304df7b8
parent 7b64ad549a271c488261f616b4bbb77da2df13eb
parent 131365a3e560224edd48f73ecf45bcc57cad4c6d

[vold] Add argument verification to IncFS methods am: 131365a3e5

Change-Id: I8a19bea4ca9c8f30f754cf7d43feba432152e204

VoldNativeService.cpp

diff --git a/VoldNativeService.cpp b/VoldNativeService.cpp
index 5a77a83..1cf1eaf 100644
--- a/VoldNativeService.cpp
+++ b/VoldNativeService.cpp
@@ -744,7 +744,7 @@
     return translateBool(fscrypt_lock_user_key(userId));
 }
 
-binder::Status VoldNativeService::prepareUserStorage(const std::unique_ptr<std::string>& uuid,
+binder::Status VoldNativeService::prepareUserStorage(const std::optional<std::string>& uuid,
                                                      int32_t userId, int32_t userSerial,
                                                      int32_t flags) {
     ENFORCE_SYSTEM_OR_ROOT;
@@ -756,7 +756,7 @@
     return translateBool(fscrypt_prepare_user_storage(uuid_, userId, userSerial, flags));
 }
 
-binder::Status VoldNativeService::destroyUserStorage(const std::unique_ptr<std::string>& uuid,
+binder::Status VoldNativeService::destroyUserStorage(const std::optional<std::string>& uuid,
                                                      int32_t userId, int32_t flags) {
     ENFORCE_SYSTEM_OR_ROOT;
     std::string empty_string = "";

VoldNativeService.h

diff --git a/VoldNativeService.h b/VoldNativeService.h
index 2f4b6eb..9cd0435 100644
--- a/VoldNativeService.h
+++ b/VoldNativeService.h
@@ -125,9 +125,9 @@
                                  const std::string& secret);
     binder::Status lockUserKey(int32_t userId);
 
-    binder::Status prepareUserStorage(const std::unique_ptr<std::string>& uuid, int32_t userId,
+    binder::Status prepareUserStorage(const std::optional<std::string>& uuid, int32_t userId,
                                       int32_t userSerial, int32_t flags);
-    binder::Status destroyUserStorage(const std::unique_ptr<std::string>& uuid, int32_t userId,
+    binder::Status destroyUserStorage(const std::optional<std::string>& uuid, int32_t userId,
                                       int32_t flags);
 
     binder::Status prepareSandboxForApp(const std::string& packageName, int32_t appId,