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/api1/Camera2Client.h

diff --git a/services/camera/libcameraservice/api1/Camera2Client.h b/services/camera/libcameraservice/api1/Camera2Client.h
index 8a17b17..8034ab4 100644
--- a/services/camera/libcameraservice/api1/Camera2Client.h
+++ b/services/camera/libcameraservice/api1/Camera2Client.h
@@ -93,6 +93,7 @@
     Camera2Client(const sp<CameraService>& cameraService,
             const sp<hardware::ICameraClient>& cameraClient,
             const String16& clientPackageName,
+            const std::unique_ptr<String16>& clientFeatureId,
             const String8& cameraDeviceId,
             int api1CameraId,
             int cameraFacing,