Use String8/16 c_str [camera udc-dev-plus-aosp]
Bug: 295394788
Test: make checkbuild
Change-Id: Ic2337204b92c9f1552e35972d0a888afa7e36786
diff --git a/camera/ndk/impl/ACameraDevice.cpp b/camera/ndk/impl/ACameraDevice.cpp
index 024ed20..97d65b0 100644
--- a/camera/ndk/impl/ACameraDevice.cpp
+++ b/camera/ndk/impl/ACameraDevice.cpp
@@ -368,24 +368,24 @@
// 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;
}
}
diff --git a/services/camera/libcameraservice/aidl/AidlCameraDeviceUser.cpp b/services/camera/libcameraservice/aidl/AidlCameraDeviceUser.cpp
index 402f8a2..954cb8b 100644
--- a/services/camera/libcameraservice/aidl/AidlCameraDeviceUser.cpp
+++ b/services/camera/libcameraservice/aidl/AidlCameraDeviceUser.cpp
@@ -119,7 +119,7 @@
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 @@
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 @@
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 @@
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);
}
diff --git a/services/camera/libcameraservice/aidl/AidlCameraService.cpp b/services/camera/libcameraservice/aidl/AidlCameraService.cpp
index a62f6de..8cd7d1f 100644
--- a/services/camera/libcameraservice/aidl/AidlCameraService.cpp
+++ b/services/camera/libcameraservice/aidl/AidlCameraService.cpp
@@ -103,7 +103,7 @@
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 @@
}
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 =