commit fdacc8d46282393b2aea556181ad88e62e6c65ce
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 16 15:56:09 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 16 15:56:09 2020 +0000
tree 7e1fe6234225a1e16683efd9406ec216050fcda7
parent 03d5991abc10576d7a4e85ec339305805e1068ef
parent 6b1225770261cbad5cbf6509a32743691fe40783

Make storage dirs remount fork() safe am: 6b12257702

Change-Id: I589afb12062914cc3da9ff8f7c8dd43014ac6ce9

VoldNativeService.cpp

diff --git a/VoldNativeService.cpp b/VoldNativeService.cpp
index 57cee23..cbc38d5 100644
--- a/VoldNativeService.cpp
+++ b/VoldNativeService.cpp
@@ -819,7 +819,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;
@@ -831,7 +831,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,