commit 9e648f6d57901b8d2c6d595d08d0cb55d87981e4
author Philip P. Moltmann <moltmann@google.com> Mon Nov 04 12:52:45 2019 -0800
committer Philip P. Moltmann <moltmann@google.com> Wed Nov 13 16:57:43 2019 -0800
tree 93503618ab62ac82e0f1dd0c5fa8fdefaed04748
parent f1a584a44cd2fb35a1817438db4342ee8bd6825e

Pipe through featureId from context to Camera code

Bug: 136595429
Test: atest CtsAppOpsTestCases (now including two new test cases that
          open a camera with a null and a non-null feature)
Change-Id: Idfb8f8049dff536525d4f081151c79d980d76c69

services/camera/libcameraservice/hidl/HidlCameraService.cpp

diff --git a/services/camera/libcameraservice/hidl/HidlCameraService.cpp b/services/camera/libcameraservice/hidl/HidlCameraService.cpp
index 1daa035..97ba9c4 100644
--- a/services/camera/libcameraservice/hidl/HidlCameraService.cpp
+++ b/services/camera/libcameraservice/hidl/HidlCameraService.cpp
@@ -103,7 +103,7 @@
     }
     sp<hardware::camera2::ICameraDeviceCallbacks> callbacks = hybridCallbacks;
     binder::Status serviceRet = mAidlICameraService->connectDevice(
-            callbacks, String16(cameraId.c_str()), String16(""),
+            callbacks, String16(cameraId.c_str()), String16(""), std::unique_ptr<String16>(),
             hardware::ICameraService::USE_CALLING_UID, /*out*/&deviceRemote);
     HStatus status = HStatus::NO_ERROR;
     if (!serviceRet.isOk()) {