commit b3f7cd2ec35e4fa1eb013afa13906e25bfc4bcec
author Jooyung Han <jooyung@google.com> Thu Jan 23 12:27:18 2020 +0900
committer Jooyung Han <jooyung@google.com> Wed Feb 26 04:01:10 2020 +0000
tree 8b7049d25c7a3d2a77e0b72d5e0be8e9bb82494e
parent b9bfddabc21c0819e7feccecddf09a70ade2670f

Use std::optional for nullable

AIDL now use std::optional to represent nullable types for efficiency
instead of std::unique_ptr which might cause additional heap allocation.

Bug: 1447732670
Test: m
Merged-In: I9045bc6fc2eb06839203af6db94a80de9b83ad1f
Change-Id: I9045bc6fc2eb06839203af6db94a80de9b83ad1f
(cherry picked from commit 3f9a3b407aeff0311038b2097d657446c4f98b90)

Exempt-From-Owner-Approval: CP from master

services/camera/libcameraservice/api1/Camera2Client.h

diff --git a/services/camera/libcameraservice/api1/Camera2Client.h b/services/camera/libcameraservice/api1/Camera2Client.h
index 3144e0e..c5f0428 100644
--- a/services/camera/libcameraservice/api1/Camera2Client.h
+++ b/services/camera/libcameraservice/api1/Camera2Client.h
@@ -94,7 +94,7 @@
     Camera2Client(const sp<CameraService>& cameraService,
             const sp<hardware::ICameraClient>& cameraClient,
             const String16& clientPackageName,
-            const std::unique_ptr<String16>& clientFeatureId,
+            const std::optional<String16>& clientFeatureId,
             const String8& cameraDeviceId,
             int api1CameraId,
             int cameraFacing,