Merge "Use String8/16 c_str [camera udc-dev-plus-aosp]" into aosp-main-future (93db7ade) · Commits · e / os / android_frameworks_av

camera/ndk/impl/ACameraDevice.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -368,24 +368,24 @@ camera_status_t CameraDevice::prepareLocked(ACameraWindowType *window) {
		// ndk as well.
		if (remoteRet.exceptionCode() != EX_SERVICE_SPECIFIC) {
		ALOGE("Camera device %s failed to prepare output window %p: %s", getId(), window,
		remoteRet.toString8().string());
		remoteRet.toString8().c_str());
		return ACAMERA_ERROR_UNKNOWN;

		}
		switch (remoteRet.serviceSpecificErrorCode()) {
		case hardware::ICameraService::ERROR_INVALID_OPERATION:
		ALOGE("Camera device %s invalid operation: %s", getId(),
		remoteRet.toString8().string());
		remoteRet.toString8().c_str());
		return ACAMERA_ERROR_INVALID_OPERATION;
		break;
		case hardware::ICameraService::ERROR_ILLEGAL_ARGUMENT:
		ALOGE("Camera device %s invalid input argument: %s", getId(),
		remoteRet.toString8().string());
		remoteRet.toString8().c_str());
		return ACAMERA_ERROR_INVALID_PARAMETER;
		break;
		default:
		ALOGE("Camera device %s failed to prepare output window %p: %s", getId(), window,
		remoteRet.toString8().string());
		remoteRet.toString8().c_str());
		return ACAMERA_ERROR_UNKNOWN;
		}
		}

services/camera/libcameraservice/aidl/AidlCameraDeviceUser.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -119,7 +119,7 @@ ndk::ScopedAStatus AidlCameraDeviceUser::submitRequestList(
		in_isRepeating, &submitInfo);
		if (!ret.isOk()) {
		ALOGE("%s: Failed submitRequestList to cameraservice: %s",
		__FUNCTION__, ret.toString8().string());
		__FUNCTION__, ret.toString8().c_str());
		return fromUStatus(ret);
		}
		mRequestId = submitInfo.mRequestId;
		@@ -158,7 +158,7 @@ ndk::ScopedAStatus AidlCameraDeviceUser::createStream(
		int32_t newStreamId;
		UStatus ret = mDeviceRemote->createStream(outputConfig, &newStreamId);
		if (!ret.isOk()) {
		ALOGE("%s: Failed to create stream: %s", __FUNCTION__, ret.toString8().string());
		ALOGE("%s: Failed to create stream: %s", __FUNCTION__, ret.toString8().c_str());
		}
		*_aidl_return = newStreamId;
		return fromUStatus(ret);
		@@ -170,7 +170,7 @@ ndk::ScopedAStatus AidlCameraDeviceUser::createDefaultRequest(STemplateId in_tem
		UStatus ret = mDeviceRemote->createDefaultRequest(convertFromAidl(in_templateId),
		&metadata);
		if (!ret.isOk()) {
		ALOGE("%s: Failed to create default request: %s", __FUNCTION__, ret.toString8().string());
		ALOGE("%s: Failed to create default request: %s", __FUNCTION__, ret.toString8().c_str());
		return fromUStatus(ret);
		}

		@@ -202,7 +202,7 @@ ndk::ScopedAStatus AidlCameraDeviceUser::updateOutputConfiguration(
		UStatus ret = mDeviceRemote->updateOutputConfiguration(in_streamId, outputConfig);
		if (!ret.isOk()) {
		ALOGE("%s: Failed to update output config for stream id: %d: %s",
		__FUNCTION__, in_streamId, ret.toString8().string());
		__FUNCTION__, in_streamId, ret.toString8().c_str());
		}
		return fromUStatus(ret);
		}

services/camera/libcameraservice/aidl/AidlCameraService.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ ScopedAStatus AidlCameraService::getCameraCharacteristics(const std::string& in_
		return fromSStatus(SStatus::ILLEGAL_ARGUMENT);
		default:
		ALOGE("Get camera characteristics from camera service failed: %s",
		ret.toString8().string());
		ret.toString8().c_str());
		return fromUStatus(ret);
		}
		}
		@@ -313,7 +313,7 @@ ndk::ScopedAStatus AidlCameraService::getCameraVendorTagSections(
		}
		vendorTagSections.resize(numSections);
		for (size_t s = 0; s < numSections; s++) {
		vendorTagSections[s].sectionName = (*sectionNames)[s].string();
		vendorTagSections[s].sectionName = (*sectionNames)[s].c_str();
		vendorTagSections[s].tags = tagsBySection[s];
		}
		SProviderIdAndVendorTagSections & prvdrIdAndVendorTagSection =