Snap for 6478919 from fd267eb2f96969b8cb19389a06a6c1dbbc2ec40a to rvc-release (4ca6ae0c) · Commits · e / devices / smdk4412 / android_frameworks_av

camera/ICameraClient.cpp

+8 −10

Original line number	Diff line number	Diff line
		@@ -139,20 +139,18 @@ status_t BnCameraClient::onTransact(
		CHECK_INTERFACE(ICameraClient, data, reply);
		int32_t msgType = data.readInt32();
		sp<IMemory> imageData = interface_cast<IMemory>(data.readStrongBinder());
		camera_frame_metadata_t *metadata = NULL;
		camera_frame_metadata_t metadata;
		if (data.dataAvail() > 0) {
		metadata = new camera_frame_metadata_t;
		metadata->number_of_faces = data.readInt32();
		if (metadata->number_of_faces <= 0 \|\|
		metadata->number_of_faces > (int32_t)(INT32_MAX / sizeof(camera_face_t))) {
		ALOGE("%s: Too large face count: %d", __FUNCTION__, metadata->number_of_faces);
		metadata.number_of_faces = data.readInt32();
		if (metadata.number_of_faces <= 0 \|\|
		metadata.number_of_faces > (int32_t)(INT32_MAX / sizeof(camera_face_t))) {
		ALOGE("%s: Too large face count: %d", __FUNCTION__, metadata.number_of_faces);
		return BAD_VALUE;
		}
		metadata->faces = (camera_face_t *) data.readInplace(
		sizeof(camera_face_t) * metadata->number_of_faces);
		metadata.faces = (camera_face_t *) data.readInplace(
		sizeof(camera_face_t) * metadata.number_of_faces);
		}
		dataCallback(msgType, imageData, metadata);
		if (metadata) delete metadata;
		dataCallback(msgType, imageData, &metadata);
		return NO_ERROR;
		} break;
		case DATA_CALLBACK_TIMESTAMP: {

+2 −1

Original line number	Diff line number	Diff line
		@@ -144,7 +144,8 @@ void AudioFlinger::DeviceEffectManager::dump(int fd) {
		write(fd, result.string(), result.size());
		}

		write(fd, "\nDevice Effects:\n", sizeof("\nDevice Effects:\n"));
		String8 heading("\nDevice Effects:\n");
		write(fd, heading.string(), heading.size());
		for (const auto& iter : mDeviceEffects) {
		String8 outStr;
		outStr.appendFormat("%*sEffect for device %s address %s:\n", 2, "",