commit d1ad6c6b70f775169ab5b211ff08926f1ed0f36b
author Austin Borger <borgera@google.com> Mon Jul 01 11:28:31 2024 -0700
committer Austin Borger <borgera@google.com> Mon Jul 08 11:38:50 2024 -0700
tree bfaac1f8377d72d4d523d3be8bf1268f80a87283
parent a990aff49587ab9b6ba123a7f0c17d900d65e429

CameraService: Pass package name / attributionTag in AttributionSource

In addition to the uid/pid/deviceId, pass the package name and
attributionTag parameters to connect/connectDevice through
the clientAttribution argument.

Test: atest CtsCameraTestCases
Test: Smoke test GCA
Bug: 343965468
Bug: 190657833
Flag: EXEMPT Strict mechanical refactor
Change-Id: I08743c168486fa4f95398142b071851f8c6de9a9

camera/tests/CameraZSLTests.cpp

diff --git a/camera/tests/CameraZSLTests.cpp b/camera/tests/CameraZSLTests.cpp
index b80ad15..2740d09 100644
--- a/camera/tests/CameraZSLTests.cpp
+++ b/camera/tests/CameraZSLTests.cpp
@@ -216,8 +216,9 @@
 
         clientAttribution.uid = hardware::ICameraService::USE_CALLING_UID;
         clientAttribution.pid = hardware::ICameraService::USE_CALLING_PID;
+        clientAttribution.packageName = "ZSLTest";
         rc = mCameraService->connect(this, cameraId,
-                "ZSLTest", /*targetSdkVersion*/__ANDROID_API_FUTURE__,
+                /*targetSdkVersion*/__ANDROID_API_FUTURE__,
                 /*overrideToPortrait*/false, /*forceSlowJpegMode*/false, clientAttribution,
                 /*devicePolicy*/0, &cameraDevice);
         EXPECT_TRUE(rc.isOk());