commit f5f3a4a0067ee7681fb30981e7fb5e630a88a80a
author Jooyung Han <jooyung@google.com> Thu Feb 27 03:06:14 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 27 03:06:14 2020 +0000
tree f3cfad16f4780f1c09911a037958dcc2f342f35c
parent 550fef9128badbdd37a7f335d54609f02bc8685a
parent ee71fdf3dbfc31177dbaffb4ad1c3746ccd203cd

Merge "Use std::optional for nullable"

media/libaudioclient/AudioAttributes.cpp

diff --git a/media/libaudioclient/AudioAttributes.cpp b/media/libaudioclient/AudioAttributes.cpp
index 1ee6930..ff4ba06 100644
--- a/media/libaudioclient/AudioAttributes.cpp
+++ b/media/libaudioclient/AudioAttributes.cpp
@@ -57,7 +57,7 @@
         parcel->writeInt32(0);
     } else {
         parcel->writeInt32(1);
-        parcel->writeUtf8AsUtf16(mAttributes.tags);
+        parcel->writeUtf8AsUtf16(std::string(mAttributes.tags));
     }
     parcel->writeInt32(static_cast<int32_t>(mStreamType));
     parcel->writeUint32(static_cast<uint32_t>(mGroupId));

services/camera/libcameraservice/CameraService.h

diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
index 1283148..4e04f0e 100644
--- a/services/camera/libcameraservice/CameraService.h
+++ b/services/camera/libcameraservice/CameraService.h
@@ -50,6 +50,7 @@
 #include <string>
 #include <map>
 #include <memory>
+#include <optional>
 #include <utility>
 #include <unordered_map>
 #include <unordered_set>