Merge "CameraService: Pass package name / attributionTag in AttributionSource" into main (baab4581) · Commits · e / os / android_frameworks_base

core/java/android/hardware/Camera.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -569,7 +569,6 @@ public class Camera {
		return native_setup(
		new WeakReference<>(this),
		cameraId,
		ActivityThread.currentOpPackageName(),
		rotationOverride,
		forceSlowJpegMode,
		clientAttribution.getParcel(),
		@@ -660,7 +659,6 @@ public class Camera {
		private native int native_setup(
		Object cameraThis,
		int cameraId,
		String packageName,
		int rotationOverride,
		boolean forceSlowJpegMode,
		Parcel clientAttributionParcel,

core/java/android/hardware/camera2/CameraManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -980,6 +980,8 @@ public final class CameraManager {
		clientAttribution.uid = USE_CALLING_UID;
		clientAttribution.pid = USE_CALLING_PID;
		clientAttribution.deviceId = contextAttribution.deviceId;
		clientAttribution.packageName = mContext.getOpPackageName();
		clientAttribution.attributionTag = mContext.getAttributionTag();
		clientAttribution.next = new AttributionSourceState[0];
		return clientAttribution;
		}
		@@ -1041,8 +1043,6 @@ public final class CameraManager {
		cameraService.connectDevice(
		callbacks,
		cameraId,
		mContext.getOpPackageName(),
		mContext.getAttributionTag(),
		oomScoreOffset,
		mContext.getApplicationInfo().targetSdkVersion,
		rotationOverride,

core/jni/android_hardware_Camera.cpp

+4 −12

Original line number	Diff line number	Diff line
		@@ -582,8 +582,8 @@ static void android_hardware_Camera_getCameraInfo(JNIEnv *env, jobject thiz, jin

		// connect to camera service
		static jint android_hardware_Camera_native_setup(JNIEnv *env, jobject thiz, jobject weak_this,
		jint cameraId, jstring clientPackageName,
		jint rotationOverride, jboolean forceSlowJpegMode,
		jint cameraId, jint rotationOverride,
		jboolean forceSlowJpegMode,
		jobject jClientAttributionParcel,
		jint devicePolicy) {
		AttributionSourceState clientAttribution;
		@@ -591,16 +591,8 @@ static jint android_hardware_Camera_native_setup(JNIEnv *env, jobject thiz, jobj
		return -EACCES;
		}

		// Convert jstring to String16
		const char16_t rawClientName = reinterpret_cast<const char16_t>(
		env->GetStringChars(clientPackageName, NULL));
		jsize rawClientNameLen = env->GetStringLength(clientPackageName);
		std::string clientName = toStdString(rawClientName, rawClientNameLen);
		env->ReleaseStringChars(clientPackageName,
		reinterpret_cast<const jchar*>(rawClientName));

		int targetSdkVersion = android_get_application_target_sdk_version();
		sp<Camera> camera = Camera::connect(cameraId, clientName, targetSdkVersion, rotationOverride,
		sp<Camera> camera = Camera::connect(cameraId, targetSdkVersion, rotationOverride,
		forceSlowJpegMode, clientAttribution, devicePolicy);
		if (camera == NULL) {
		return -EACCES;
		@@ -1089,7 +1081,7 @@ static const JNINativeMethod camMethods[] = {
		(void *)android_hardware_Camera_getNumberOfCameras},
		{"_getCameraInfo", "(IILandroid/os/Parcel;ILandroid/hardware/Camera$CameraInfo;)V",
		(void *)android_hardware_Camera_getCameraInfo},
		{"native_setup", "(Ljava/lang/Object;ILjava/lang/String;IZLandroid/os/Parcel;I)I",
		{"native_setup", "(Ljava/lang/Object;IIZLandroid/os/Parcel;I)I",
		(void *)android_hardware_Camera_native_setup},
		{"native_release", "()V", (void *)android_hardware_Camera_release},
		{"setPreviewSurface", "(Landroid/view/Surface;)V",

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/helpers/CameraTestUtils.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -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,