| commit | 9e648f6d57901b8d2c6d595d08d0cb55d87981e4 | [log] [tgz] |
|---|---|---|
| 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 [diff] [blame] |
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
diff --git a/services/camera/libcameraservice/common/Camera2ClientBase.h b/services/camera/libcameraservice/common/Camera2ClientBase.h index 6693847..12cba0b 100644 --- a/services/camera/libcameraservice/common/Camera2ClientBase.h +++ b/services/camera/libcameraservice/common/Camera2ClientBase.h
@@ -48,6 +48,7 @@ Camera2ClientBase(const sp<CameraService>& cameraService, const sp<TCamCallbacks>& remoteCallback, const String16& clientPackageName, + const std::unique_ptr<String16>& clientFeatureId, const String8& cameraId, int api1CameraId, int cameraFacing,