commit d75a10ac6f9d90b31535874cb45bcb7f84602737
author Jooyung Han <jooyung@google.com> Thu Jan 23 13:23:26 2020 +0900
committer Jooyung Han <jooyung@google.com> Thu Feb 20 17:32:21 2020 +0900
tree a41428ca907198578ce07132678ed088d67feecf
parent 39969f0288718d14b1873c5fa7ab1fb12ab338b2

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 0568fd287cfc0affc8e985f21da3793cdda286a3)

VoldNativeService.h

diff --git a/VoldNativeService.h b/VoldNativeService.h
index 18551f2..213c48d 100644
--- a/VoldNativeService.h
+++ b/VoldNativeService.h
@@ -120,9 +120,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,