From 676d6af0ef9fbd4ed0948f13639eb921832afac6 Mon Sep 17 00:00:00 2001 From: Austin Borger Date: Mon, 1 Jul 2024 11:30:53 -0700 Subject: 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: I731e53ab6a452cb962431cc5d7fc8c6f2fb271a6 --- .../com/android/mediaframeworktest/helpers/CameraTestUtils.java | 2 ++ .../android/mediaframeworktest/integration/CameraBinderTest.java | 7 +------ .../mediaframeworktest/integration/CameraDeviceBinderTest.java | 4 ---- 3 files changed, 3 insertions(+), 10 deletions(-) (limited to 'media/tests') diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestUtils.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestUtils.java index 102d21acfd19..43acbb1eacc8 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestUtils.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestUtils.java @@ -2246,6 +2246,8 @@ public class CameraTestUtils extends Assert { clientAttribution.uid = -1; // USE_CALLING_UID clientAttribution.pid = -1; // USE_CALLING_PID clientAttribution.deviceId = contextAttribution.deviceId; + clientAttribution.packageName = context.getOpPackageName(); + clientAttribution.attributionTag = context.getAttributionTag(); clientAttribution.next = new AttributionSourceState[0]; return clientAttribution; } diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java index ad3374a7da6a..ac85ab7f6a6e 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java @@ -169,10 +169,8 @@ public class CameraBinderTest extends AndroidTestCase { ICameraClient dummyCallbacks = new DummyCameraClient(); - String clientPackageName = getContext().getPackageName(); - ICamera cameraUser = mUtils.getCameraService() - .connect(dummyCallbacks, cameraId, clientPackageName, + .connect(dummyCallbacks, cameraId, getContext().getApplicationInfo().targetSdkVersion, ICameraService.ROTATION_OVERRIDE_NONE, /*forceSlowJpegMode*/false, @@ -267,8 +265,6 @@ public class CameraBinderTest extends AndroidTestCase { ICameraDeviceCallbacks dummyCallbacks = new DummyCameraDeviceCallbacks(); - String clientPackageName = getContext().getPackageName(); - String clientAttributionTag = getContext().getAttributionTag(); AttributionSourceState clientAttribution = CameraTestUtils.getClientAttribution(mContext); clientAttribution.deviceId = DEVICE_ID_DEFAULT; @@ -277,7 +273,6 @@ public class CameraBinderTest extends AndroidTestCase { ICameraDeviceUser cameraUser = mUtils.getCameraService().connectDevice( dummyCallbacks, String.valueOf(cameraId), - clientPackageName, clientAttributionTag, 0 /*oomScoreOffset*/, getContext().getApplicationInfo().targetSdkVersion, ICameraService.ROTATION_OVERRIDE_NONE, clientAttribution, diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java index 0ab1ee9095e0..35ad924cee74 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java @@ -242,9 +242,6 @@ public class CameraDeviceBinderTest extends AndroidTestCase { ICameraDeviceCallbacks.Stub dummyCallbacks = new DummyCameraDeviceCallbacks(); - String clientPackageName = getContext().getPackageName(); - String clientAttributionTag = getContext().getAttributionTag(); - mMockCb = spy(dummyCallbacks); AttributionSourceState clientAttribution = CameraTestUtils.getClientAttribution(mContext); @@ -252,7 +249,6 @@ public class CameraDeviceBinderTest extends AndroidTestCase { clientAttribution.uid = ICameraService.USE_CALLING_UID; mCameraUser = mUtils.getCameraService().connectDevice(mMockCb, mCameraId, - clientPackageName, clientAttributionTag, /*oomScoreOffset*/0, getContext().getApplicationInfo().targetSdkVersion, ICameraService.ROTATION_OVERRIDE_NONE, clientAttribution, DEVICE_POLICY_DEFAULT); assertNotNull(String.format("Camera %s was null", mCameraId), mCameraUser); -- cgit v1.2.3-59-g8ed1b