Add camera app op - camera (32fa6d0e) · Commits · e / os / android_frameworks_av

camera/Camera.cpp

+4 −5

Original line number	Diff line number	Diff line
		@@ -71,14 +71,13 @@ Camera::~Camera()
		// deadlock if we call any method of ICamera here.
		}

		sp<Camera> Camera::connect(int cameraId, const String16& clientPackageName,
		int clientUid)
		sp<Camera> Camera::connect(int cameraId, const String16& opPackageName, int clientUid)
		{
		return CameraBaseT::connect(cameraId, clientPackageName, clientUid);
		return CameraBaseT::connect(cameraId, opPackageName, clientUid);
		}

		status_t Camera::connectLegacy(int cameraId, int halVersion,
		const String16& clientPackageName,
		const String16& opPackageName,
		int clientUid,
		sp<Camera>& camera)
		{
		@@ -89,7 +88,7 @@ status_t Camera::connectLegacy(int cameraId, int halVersion,
		const sp<ICameraService>& cs = CameraBaseT::getCameraService();

		if (cs != 0) {
		status = cs.get()->connectLegacy(cl, cameraId, halVersion, clientPackageName,
		status = cs.get()->connectLegacy(cl, cameraId, halVersion, opPackageName,
		clientUid, /out/c->mCamera);
		}
		if (status == OK && c->mCamera != 0) {

camera/CameraBase.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ const sp<ICameraService>& CameraBase<TCam, TCamTraits>::getCameraService()

		template <typename TCam, typename TCamTraits>
		sp<TCam> CameraBase<TCam, TCamTraits>::connect(int cameraId,
		const String16& clientPackageName,
		const String16& opPackageName,
		int clientUid)
		{
		ALOGV("%s: connect", __FUNCTION__);
		@@ -102,7 +102,7 @@ sp<TCam> CameraBase<TCam, TCamTraits>::connect(int cameraId,

		if (cs != 0) {
		TCamConnectService fnConnectService = TCamTraits::fnConnectService;
		status = (cs.get()->*fnConnectService)(cl, cameraId, clientPackageName, clientUid,
		status = (cs.get()->*fnConnectService)(cl, cameraId, opPackageName, clientUid,
		/out/ c->mCamera);
		}
		if (status == OK && c->mCamera != 0) {

camera/ICameraService.cpp

+12 −12

Original line number	Diff line number	Diff line
		@@ -164,7 +164,7 @@ public:

		// connect to camera service (android.hardware.Camera)
		virtual status_t connect(const sp<ICameraClient>& cameraClient, int cameraId,
		const String16 &clientPackageName, int clientUid,
		const String16& opPackageName, int clientUid,
		/out/
		sp<ICamera>& device)
		{
		@@ -172,7 +172,7 @@ public:
		data.writeInterfaceToken(ICameraService::getInterfaceDescriptor());
		data.writeStrongBinder(IInterface::asBinder(cameraClient));
		data.writeInt32(cameraId);
		data.writeString16(clientPackageName);
		data.writeString16(opPackageName);
		data.writeInt32(clientUid);
		remote()->transact(BnCameraService::CONNECT, data, &reply);

		@@ -187,7 +187,7 @@ public:
		// connect to camera service (android.hardware.Camera)
		virtual status_t connectLegacy(const sp<ICameraClient>& cameraClient, int cameraId,
		int halVersion,
		const String16 &clientPackageName, int clientUid,
		const String16& opPackageName, int clientUid,
		/out/sp<ICamera>& device)
		{
		Parcel data, reply;
		@@ -195,7 +195,7 @@ public:
		data.writeStrongBinder(IInterface::asBinder(cameraClient));
		data.writeInt32(cameraId);
		data.writeInt32(halVersion);
		data.writeString16(clientPackageName);
		data.writeString16(opPackageName);
		data.writeInt32(clientUid);
		remote()->transact(BnCameraService::CONNECT_LEGACY, data, &reply);

		@@ -225,7 +225,7 @@ public:
		virtual status_t connectDevice(
		const sp<ICameraDeviceCallbacks>& cameraCb,
		int cameraId,
		const String16& clientPackageName,
		const String16& opPackageName,
		int clientUid,
		/out/
		sp<ICameraDeviceUser>& device)
		@@ -234,7 +234,7 @@ public:
		data.writeInterfaceToken(ICameraService::getInterfaceDescriptor());
		data.writeStrongBinder(IInterface::asBinder(cameraCb));
		data.writeInt32(cameraId);
		data.writeString16(clientPackageName);
		data.writeString16(opPackageName);
		data.writeInt32(clientUid);
		remote()->transact(BnCameraService::CONNECT_DEVICE, data, &reply);

		@@ -374,11 +374,11 @@ status_t BnCameraService::onTransact(
		sp<ICameraClient> cameraClient =
		interface_cast<ICameraClient>(data.readStrongBinder());
		int32_t cameraId = data.readInt32();
		const String16 clientName = data.readString16();
		const String16 opPackageName = data.readString16();
		int32_t clientUid = data.readInt32();
		sp<ICamera> camera;
		status_t status = connect(cameraClient, cameraId,
		clientName, clientUid, /out/camera);
		opPackageName, clientUid, /out/camera);
		reply->writeNoException();
		reply->writeInt32(status);
		if (camera != NULL) {
		@@ -394,11 +394,11 @@ status_t BnCameraService::onTransact(
		sp<ICameraDeviceCallbacks> cameraClient =
		interface_cast<ICameraDeviceCallbacks>(data.readStrongBinder());
		int32_t cameraId = data.readInt32();
		const String16 clientName = data.readString16();
		const String16 opPackageName = data.readString16();
		int32_t clientUid = data.readInt32();
		sp<ICameraDeviceUser> camera;
		status_t status = connectDevice(cameraClient, cameraId,
		clientName, clientUid, /out/camera);
		opPackageName, clientUid, /out/camera);
		reply->writeNoException();
		reply->writeInt32(status);
		if (camera != NULL) {
		@@ -454,11 +454,11 @@ status_t BnCameraService::onTransact(
		interface_cast<ICameraClient>(data.readStrongBinder());
		int32_t cameraId = data.readInt32();
		int32_t halVersion = data.readInt32();
		const String16 clientName = data.readString16();
		const String16 opPackageName = data.readString16();
		int32_t clientUid = data.readInt32();
		sp<ICamera> camera;
		status_t status = connectLegacy(cameraClient, cameraId, halVersion,
		clientName, clientUid, /out/camera);
		opPackageName, clientUid, /out/camera);
		reply->writeNoException();
		reply->writeInt32(status);
		if (camera != NULL) {

include/camera/Camera.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -71,11 +71,11 @@ public:
		// construct a camera client from an existing remote
		static sp<Camera> create(const sp<ICamera>& camera);
		static sp<Camera> connect(int cameraId,
		const String16& clientPackageName,
		const String16& opPackageName,
		int clientUid);

		static status_t connectLegacy(int cameraId, int halVersion,
		const String16& clientPackageName,
		const String16& opPackageName,
		int clientUid, sp<Camera>& camera);

		virtual ~Camera();

include/camera/ICameraService.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ public:
		*/
		virtual status_t connect(const sp<ICameraClient>& cameraClient,
		int cameraId,
		const String16& clientPackageName,
		const String16& opPackageName,
		int clientUid,
		/out/
		sp<ICamera>& device) = 0;
		@@ -117,7 +117,7 @@ public:
		virtual status_t connectDevice(
		const sp<ICameraDeviceCallbacks>& cameraCb,
		int cameraId,
		const String16& clientPackageName,
		const String16& opPackageName,
		int clientUid,
		/out/
		sp<ICameraDeviceUser>& device) = 0;
		@@ -141,7 +141,7 @@ public:
		*/
		virtual status_t connectLegacy(const sp<ICameraClient>& cameraClient,
		int cameraId, int halVersion,
		const String16& clientPackageName,
		const String16& opPackageName,
		int clientUid,
		/out/
		sp<ICamera>& device) = 0;