Merge "automotive: Remove unnecessary std::move" into main (c9777e83) · Commits · e / os / android_hardware_interfaces

automotive/evs/1.1/default/EvsCamera.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -495,7 +495,7 @@ unsigned EvsCamera::increaseAvailableFrames_Locked(unsigned numToAdd) {
		}
		if (!stored) {
		// Add a BufferRecord wrapping this handle to our set of available buffers
		mBuffers.push_back(std::move(BufferRecord(memHandle)));
		mBuffers.push_back(BufferRecord(memHandle));
		}

		mFramesAllowed++;

+6 −6

Original line number	Diff line number	Diff line
		@@ -199,8 +199,8 @@ size_t ConfigManager::readCameraCapabilities(const XMLElement* const aCapElem, C

		CameraParam aParam;
		if (ConfigManagerUtil::convertToEvsCameraParam(nameAttr, aParam)) {
		aCamera->controls.insert_or_assign(
		aParam, std::move(std::make_tuple(minVal, maxVal, stepVal)));
		aCamera->controls.insert_or_assign(aParam,
		std::make_tuple(minVal, maxVal, stepVal));
		}

		ctrlElem = ctrlElem->NextSiblingElement("control");
		@@ -583,8 +583,8 @@ bool ConfigManager::readConfigDataFromBinary() {
		CameraCtrl* ptr = reinterpret_cast<CameraCtrl*>(p);
		for (size_t idx = 0; idx < sz; ++idx) {
		CameraCtrl temp = *ptr++;
		aCamera->controls.insert_or_assign(
		temp.cid, std::move(std::make_tuple(temp.min, temp.max, temp.step)));
		aCamera->controls.insert_or_assign(temp.cid,
		std::make_tuple(temp.min, temp.max, temp.step));
		}
		p = reinterpret_cast<char*>(ptr);

		@@ -689,8 +689,8 @@ bool ConfigManager::readConfigDataFromBinary() {
		CameraCtrl* ptr = reinterpret_cast<CameraCtrl*>(p);
		for (size_t idx = 0; idx < sz; ++idx) {
		CameraCtrl temp = *ptr++;
		aCamera->controls.insert_or_assign(
		temp.cid, std::move(std::make_tuple(temp.min, temp.max, temp.step)));
		aCamera->controls.insert_or_assign(temp.cid,
		std::make_tuple(temp.min, temp.max, temp.step));
		}
		p = reinterpret_cast<char*>(ptr);

+1 −1

Original line number	Diff line number	Diff line
		@@ -353,7 +353,7 @@ ScopedAStatus EvsGlDisplay::getTargetBuffer(BufferDesc* _aidl_return) {
		.buffer =
		{
		.description = mBuffer.description,
		.handle = std::move(::android::dupToAidl(mBuffer.handle)),
		.handle = ::android::dupToAidl(mBuffer.handle),
		},
		.pixelSizeBytes = 4, // RGBA_8888 is 4-byte-per-pixel format
		.bufferId = mBuffer.fingerprint,

+4 −4

Original line number	Diff line number	Diff line
		@@ -50,12 +50,12 @@ NativeHandle dupNativeHandle(const NativeHandle& handle, bool doDup) {
		}
		} else {
		for (auto i = 0; i < handle.fds.size(); ++i) {
		dup.fds[i] = std::move(handle.fds[i].dup());
		dup.fds[i] = handle.fds[i].dup();
		}
		}
		dup.ints = handle.ints;

		return std::move(dup);
		return dup;
		}

		HardwareBuffer dupHardwareBuffer(const HardwareBuffer& buffer, bool doDup) {
		@@ -64,7 +64,7 @@ HardwareBuffer dupHardwareBuffer(const HardwareBuffer& buffer, bool doDup) {
		.handle = dupNativeHandle(buffer.handle, doDup),
		};

		return std::move(dup);
		return dup;
		}

		BufferDesc dupBufferDesc(const BufferDesc& src, bool doDup) {
		@@ -77,7 +77,7 @@ BufferDesc dupBufferDesc(const BufferDesc& src, bool doDup) {
		.metadata = src.metadata,
		};

		return std::move(dup);
		return dup;
		}

		bool comparePayload(const EvsEventDesc& l, const EvsEventDesc& r) {

+2 −2

Original line number	Diff line number	Diff line
		@@ -583,12 +583,12 @@ std::vector<std::string> VehicleHalManager::getOptionValues(const hidl_vec<hidl_
		while (*index < options.size()) {
		std::string option = options[*index];
		if (kSetPropOptions.find(option) != kSetPropOptions.end()) {
		return std::move(values);
		return values;
		}
		values.push_back(option);
		(*index)++;
		}
		return std::move(values);
		return values;
		}

		bool VehicleHalManager::parseSetPropOptions(int fd, const hidl_vec<hidl_string>& options,