commit f06148d31c7208df4ad82d4f1cc6d3812d58b409
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 02 13:46:59 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 02 13:46:59 2020 +0000
tree 1dcc2db4b7b4ad5664ab993e62fbb50608192683
parent cf54a7bf4f4c18ddd3de4073dae5f9af8fefbbd7
parent c1e33a3cc979ea2ea4a808f2fd7bfddd53789d1a

Add Android/data mounting along with obb mounting in vold am: c1e33a3cc9

Change-Id: I27cf0237c56e1a932746bdc147e842381374601d

VoldNativeService.cpp

diff --git a/VoldNativeService.cpp b/VoldNativeService.cpp
index 08b4661..788d750 100644
--- a/VoldNativeService.cpp
+++ b/VoldNativeService.cpp
@@ -811,7 +811,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;
@@ -823,7 +823,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 e04c259..61f5c3f 100644
--- a/VoldNativeService.h
+++ b/VoldNativeService.h
@@ -123,9 +123,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,