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.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,