commit 4fcb707ecdb0df9111d620f0c0c2aca025c392ff
author Jooyung Han <jooyung@google.com> Thu Jan 23 13:23:26 2020 +0900
committer Jooyung Han <jooyung@google.com> Wed Feb 26 03:58:22 2020 +0000
tree 23eb4d5884504d73afecfb10f5254aa58a1c54ea
parent 6a4d95d08e2c765a22dbcda62c4aad9256aa4aad

Use optional for nullable types

AIDL generates optional<T> for nullable T types for C++, which is more
efficient and idomatic and easy to use.

Bug: 144773267
Test: build/flash/boot
Merged-In: I98549c8614c9152d5d45e2f1f33f2f3c31a9bbbf
Change-Id: I98549c8614c9152d5d45e2f1f33f2f3c31a9bbbf
(cherry picked from commit 3ce0ee5363c9325e5c95dadbe24a03d94aedc90e)

Exempt-From-Owner-Approval: CP from master

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 = "";