commit da21163bc8101d6bd85a2d29464065fd6e9dffc0
author Austin Borger <borgera@google.com> Mon Dec 02 10:27:03 2024 -0800
committer Austin Borger <borgera@google.com> Mon Dec 02 10:28:55 2024 -0800
tree 180e56c1f2973c3e3702bf5a9291ff9c38277fd5
parent 9aab1380a87a0cedb35788e48016737805564a2d

Create a token for the AttributionSource CameraSource passes to connect

If an AttributionSource does not have a token, data delivery permission checks
fail with "Attempt to invoke interface method
'void android.os.IBinder.linkToDeath(android.os.IBinder$DeathRecipient, int)'
on a null object reference" due to the null binder. Create a token before
passing it to connect.

Bug: 190657833
Flag: com.android.internal.camera.flags.data_delivery_permission_checks
Test: Ran CtsCameraTestCases
Change-Id: I83c760c8a81976d899b75942eb5177baaa590a16

media/libstagefright/CameraSource.cpp

diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp
index 81a5508..fe1d3b6 100644
--- a/media/libstagefright/CameraSource.cpp
+++ b/media/libstagefright/CameraSource.cpp
@@ -157,6 +157,7 @@
         clientAttribution.uid = clientUid;
         clientAttribution.deviceId = kDefaultDeviceId;
         clientAttribution.packageName = clientName;
+        clientAttribution.token = sp<BBinder>::make();
 
         mCamera = Camera::connect(cameraId, /*targetSdkVersion*/__ANDROID_API_FUTURE__,
                 /*rotationOverride*/hardware::ICameraService::ROTATION_OVERRIDE_NONE,