diff --git a/camera/CameraBase.cpp b/camera/CameraBase.cpp index be1d4c50a1..1af899de9b 100644 --- a/camera/CameraBase.cpp +++ b/camera/CameraBase.cpp @@ -185,7 +185,7 @@ sp CameraBase::connect(int cameraId, c->mStatus = NO_ERROR; } else { ALOGW("An error occurred while connecting to camera %d: %s", cameraId, - (cs == nullptr) ? "Service not available" : ret.toString8().string()); + (cs == nullptr) ? "Service not available" : ret.toString8().c_str()); c.clear(); } return c; @@ -270,7 +270,7 @@ int CameraBase::getNumberOfCameras() { &count); if (!res.isOk()) { ALOGE("Error reading number of cameras: %s", - res.toString8().string()); + res.toString8().c_str()); count = 0; } return count; diff --git a/camera/CameraMetadata.cpp b/camera/CameraMetadata.cpp index a4ae71be2c..2e808d1272 100644 --- a/camera/CameraMetadata.cpp +++ b/camera/CameraMetadata.cpp @@ -289,7 +289,7 @@ status_t CameraMetadata::update(uint32_t tag, return res; } // string.size() doesn't count the null termination character. - return updateImpl(tag, (const void*)string.string(), string.size() + 1); + return updateImpl(tag, (const void*)string.c_str(), string.size() + 1); } status_t CameraMetadata::update(const camera_metadata_ro_entry &entry) { @@ -809,7 +809,7 @@ status_t CameraMetadata::getTagFromName(const char *name, for (size_t i = 0; i < totalSectionCount; ++i) { const char *str = (i < ANDROID_SECTION_COUNT) ? camera_metadata_section_names[i] : - (*vendorSections)[i - ANDROID_SECTION_COUNT].string(); + (*vendorSections)[i - ANDROID_SECTION_COUNT].c_str(); ALOGV("%s: Trying to match against section '%s'", __FUNCTION__, str); diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index e95c91cb98..272b113f23 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -205,7 +205,7 @@ String8 CameraParameters::flatten() const void CameraParameters::unflatten(const String8 ¶ms) { - const char *a = params.string(); + const char *a = params.c_str(); const char *b; mMap.clear(); @@ -271,7 +271,7 @@ const char *CameraParameters::get(const char *key) const String8 v = mMap.valueFor(String8(key)); if (v.length() == 0) return 0; - return v.string(); + return v.c_str(); } int CameraParameters::getInt(const char *key) const @@ -463,7 +463,7 @@ void CameraParameters::dump() const String8 k, v; k = mMap.keyAt(i); v = mMap.valueAt(i); - ALOGD("%s: %s\n", k.string(), v.string()); + ALOGD("%s: %s\n", k.c_str(), v.c_str()); } } @@ -478,10 +478,10 @@ status_t CameraParameters::dump(int fd, const Vector& /*args*/) const String8 k, v; k = mMap.keyAt(i); v = mMap.valueAt(i); - snprintf(buffer, 255, "\t%s: %s\n", k.string(), v.string()); + snprintf(buffer, 255, "\t%s: %s\n", k.c_str(), v.c_str()); result.append(buffer); } - write(fd, result.string(), result.size()); + write(fd, result.c_str(), result.size()); return NO_ERROR; } diff --git a/camera/CameraParameters2.cpp b/camera/CameraParameters2.cpp index a1cf3553f4..1ccad08a27 100644 --- a/camera/CameraParameters2.cpp +++ b/camera/CameraParameters2.cpp @@ -52,14 +52,14 @@ String8 CameraParameters2::flatten() const flattened += ";"; } - ALOGV("%s: Flattened params = %s", __FUNCTION__, flattened.string()); + ALOGV("%s: Flattened params = %s", __FUNCTION__, flattened.c_str()); return flattened; } void CameraParameters2::unflatten(const String8 ¶ms) { - const char *a = params.string(); + const char *a = params.c_str(); const char *b; mMap.clear(); @@ -128,7 +128,7 @@ const char *CameraParameters2::get(const char *key) const if (idx < 0) { return NULL; } else { - return mMap.valueAt(idx).string(); + return mMap.valueAt(idx).c_str(); } } @@ -305,7 +305,7 @@ void CameraParameters2::getPreviewFpsRange(int *min_fps, int *max_fps) const void CameraParameters2::setPreviewFpsRange(int min_fps, int max_fps) { String8 str = String8::format("%d,%d", min_fps, max_fps); - set(CameraParameters::KEY_PREVIEW_FPS_RANGE, str.string()); + set(CameraParameters::KEY_PREVIEW_FPS_RANGE, str.c_str()); } void CameraParameters2::setPreviewFormat(const char *format) @@ -357,7 +357,7 @@ void CameraParameters2::dump() const String8 k, v; k = mMap.keyAt(i); v = mMap.valueAt(i); - ALOGD("%s: %s\n", k.string(), v.string()); + ALOGD("%s: %s\n", k.c_str(), v.c_str()); } } @@ -373,10 +373,10 @@ status_t CameraParameters2::dump(int fd, const Vector& args) const String8 k, v; k = mMap.keyAt(i); v = mMap.valueAt(i); - snprintf(buffer, 255, "\t%s: %s\n", k.string(), v.string()); + snprintf(buffer, 255, "\t%s: %s\n", k.c_str(), v.c_str()); result.append(buffer); } - write(fd, result.string(), result.size()); + write(fd, result.c_str(), result.size()); return NO_ERROR; } diff --git a/camera/VendorTagDescriptor.cpp b/camera/VendorTagDescriptor.cpp index b37803add8..6cb9197300 100644 --- a/camera/VendorTagDescriptor.cpp +++ b/camera/VendorTagDescriptor.cpp @@ -237,7 +237,7 @@ const char* VendorTagDescriptor::getSectionName(uint32_t tag) const { if (index < 0) { return VENDOR_SECTION_NAME_ERR; } - return mSections[mTagToSectionMap.valueAt(index)].string(); + return mSections[mTagToSectionMap.valueAt(index)].c_str(); } const char* VendorTagDescriptor::getTagName(uint32_t tag) const { @@ -245,7 +245,7 @@ const char* VendorTagDescriptor::getTagName(uint32_t tag) const { if (index < 0) { return VENDOR_TAG_NAME_ERR; } - return mTagToNameMap.valueAt(index).string(); + return mTagToNameMap.valueAt(index).c_str(); } int VendorTagDescriptor::getTagType(uint32_t tag) const { @@ -299,13 +299,13 @@ const SortedVector* VendorTagDescriptor::getAllSectionNames() const { status_t VendorTagDescriptor::lookupTag(const String8& name, const String8& section, /*out*/uint32_t* tag) const { ssize_t index = mReverseMapping.indexOfKey(section); if (index < 0) { - ALOGE("%s: Section '%s' does not exist.", __FUNCTION__, section.string()); + ALOGE("%s: Section '%s' does not exist.", __FUNCTION__, section.c_str()); return BAD_VALUE; } ssize_t nameIndex = mReverseMapping[index]->indexOfKey(name); if (nameIndex < 0) { - ALOGE("%s: Tag name '%s' does not exist.", __FUNCTION__, name.string()); + ALOGE("%s: Tag name '%s' does not exist.", __FUNCTION__, name.c_str()); return BAD_VALUE; } @@ -344,7 +344,7 @@ void VendorTagDescriptor::dump(int fd, int verbosity, int indentation) const { const char* typeName = (type >= 0 && type < NUM_TYPES) ? camera_metadata_type_names[type] : "UNKNOWN"; dprintf(fd, "%*s0x%x (%s) with type %d (%s) defined in section %s\n", indentation + 2, - "", tag, name.string(), type, typeName, sectionName.string()); + "", tag, name.c_str(), type, typeName, sectionName.c_str()); } } diff --git a/camera/camera2/OutputConfiguration.cpp b/camera/camera2/OutputConfiguration.cpp index 7cd9fc73f5..895543f724 100644 --- a/camera/camera2/OutputConfiguration.cpp +++ b/camera/camera2/OutputConfiguration.cpp @@ -227,7 +227,7 @@ status_t OutputConfiguration::readFromParcel(const android::Parcel* parcel) { for (auto& surface : surfaceShims) { ALOGV("%s: OutputConfiguration: %p, name %s", __FUNCTION__, surface.graphicBufferProducer.get(), - toString8(surface.name).string()); + toString8(surface.name).c_str()); mGbps.push_back(surface.graphicBufferProducer); } diff --git a/camera/include/camera/StringUtils.h b/camera/include/camera/StringUtils.h index b9dfbfc31e..547750f110 100644 --- a/camera/include/camera/StringUtils.h +++ b/camera/include/camera/StringUtils.h @@ -61,12 +61,12 @@ namespace android { } inline std::string toStdString(const String8 &str) { - return std::string(str.string()); + return std::string(str.c_str()); } inline std::string toStdString(const String16 &str) { std::wstring_convert, char16_t> convert; - return convert.to_bytes(str.string()); + return convert.to_bytes(str.c_str()); } /** diff --git a/camera/ndk/impl/ACameraDevice.cpp b/camera/ndk/impl/ACameraDevice.cpp index eba9d94321..b3de17d92a 100644 --- a/camera/ndk/impl/ACameraDevice.cpp +++ b/camera/ndk/impl/ACameraDevice.cpp @@ -163,7 +163,7 @@ CameraDevice::createCaptureRequest( templateId); return ACAMERA_ERROR_INVALID_PARAMETER; } else if (!remoteRet.isOk()) { - ALOGE("Create capture request failed: %s", remoteRet.toString8().string()); + ALOGE("Create capture request failed: %s", remoteRet.toString8().c_str()); return ACAMERA_ERROR_UNKNOWN; } ACaptureRequest* outReq = new ACaptureRequest(); @@ -317,22 +317,22 @@ camera_status_t CameraDevice::updateOutputConfigurationLocked(ACaptureSessionOut 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_ALREADY_EXISTS: ALOGE("Camera device %s output surface already exists: %s", getId(), - remoteRet.toString8().string()); + remoteRet.toString8().c_str()); return ACAMERA_ERROR_INVALID_PARAMETER; 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 add shared output: %s", getId(), - remoteRet.toString8().string()); + remoteRet.toString8().c_str()); return ACAMERA_ERROR_UNKNOWN; } } @@ -494,7 +494,7 @@ CameraDevice::stopRepeatingLocked() { ALOGV("Repeating request is already stopped."); return ACAMERA_OK; } else if (!remoteRet.isOk()) { - ALOGE("Stop repeating request fails in remote: %s", remoteRet.toString8().string()); + ALOGE("Stop repeating request fails in remote: %s", remoteRet.toString8().c_str()); return ACAMERA_ERROR_UNKNOWN; } checkRepeatingSequenceCompleteLocked(repeatingSequenceId, lastFrameNumber); @@ -546,7 +546,7 @@ CameraDevice::flushLocked(ACameraCaptureSession* session) { int64_t lastFrameNumber; binder::Status remoteRet = mRemote->flush(&lastFrameNumber); if (!remoteRet.isOk()) { - ALOGE("Abort captures fails in remote: %s", remoteRet.toString8().string()); + ALOGE("Abort captures fails in remote: %s", remoteRet.toString8().c_str()); return ACAMERA_ERROR_UNKNOWN; } if (mRepeatingSequenceId != REQUEST_ID_NONE) { @@ -570,7 +570,7 @@ CameraDevice::waitUntilIdleLocked() { binder::Status remoteRet = mRemote->waitUntilIdle(); if (!remoteRet.isOk()) { - ALOGE("Camera device %s waitUntilIdle failed: %s", getId(), remoteRet.toString8().string()); + ALOGE("Camera device %s waitUntilIdle failed: %s", getId(), remoteRet.toString8().c_str()); // TODO: define a function to convert status_t -> camera_status_t return ACAMERA_ERROR_UNKNOWN; } @@ -680,7 +680,7 @@ CameraDevice::configureStreamsLocked(const ACaptureSessionOutputContainer* outpu binder::Status remoteRet = mRemote->beginConfigure(); if (!remoteRet.isOk()) { - ALOGE("Camera device %s begin configure failed: %s", getId(), remoteRet.toString8().string()); + ALOGE("Camera device %s begin configure failed: %s", getId(), remoteRet.toString8().c_str()); return ACAMERA_ERROR_UNKNOWN; } @@ -689,7 +689,7 @@ CameraDevice::configureStreamsLocked(const ACaptureSessionOutputContainer* outpu remoteRet = mRemote->deleteStream(streamId); if (!remoteRet.isOk()) { ALOGE("Camera device %s failed to remove stream %d: %s", getId(), streamId, - remoteRet.toString8().string()); + remoteRet.toString8().c_str()); return ACAMERA_ERROR_UNKNOWN; } mConfiguredOutputs.erase(streamId); @@ -701,7 +701,7 @@ CameraDevice::configureStreamsLocked(const ACaptureSessionOutputContainer* outpu remoteRet = mRemote->createStream(outputPair.second, &streamId); if (!remoteRet.isOk()) { ALOGE("Camera device %s failed to create stream: %s", getId(), - remoteRet.toString8().string()); + remoteRet.toString8().c_str()); return ACAMERA_ERROR_UNKNOWN; } mConfiguredOutputs.insert(std::make_pair(streamId, outputPair)); @@ -716,10 +716,10 @@ CameraDevice::configureStreamsLocked(const ACaptureSessionOutputContainer* outpu ns2ms(startTimeNs), &offlineStreamIds); if (remoteRet.serviceSpecificErrorCode() == hardware::ICameraService::ERROR_ILLEGAL_ARGUMENT) { ALOGE("Camera device %s cannnot support app output configuration: %s", getId(), - remoteRet.toString8().string()); + remoteRet.toString8().c_str()); return ACAMERA_ERROR_STREAM_CONFIGURE_FAIL; } else if (!remoteRet.isOk()) { - ALOGE("Camera device %s end configure failed: %s", getId(), remoteRet.toString8().string()); + ALOGE("Camera device %s end configure failed: %s", getId(), remoteRet.toString8().c_str()); return ACAMERA_ERROR_UNKNOWN; } @@ -866,7 +866,7 @@ CameraDevice::onCaptureErrorLocked( if (cbh.mIsLogicalCameraCallback) { if (resultExtras.errorPhysicalCameraId.size() > 0) { String8 cameraId = toString8(resultExtras.errorPhysicalCameraId); - msg->setString(kFailingPhysicalCameraId, cameraId.string(), cameraId.size()); + msg->setString(kFailingPhysicalCameraId, cameraId.c_str(), cameraId.size()); } msg->setPointer(kCallbackFpKey, (void*) cbh.mOnLogicalCameraCaptureFailed); } else { diff --git a/camera/ndk/impl/ACameraDevice.h b/camera/ndk/impl/ACameraDevice.h index 17988fe8f1..fef8ec2f68 100644 --- a/camera/ndk/impl/ACameraDevice.h +++ b/camera/ndk/impl/ACameraDevice.h @@ -66,7 +66,7 @@ class CameraDevice final : public RefBase { ACameraDevice* wrapper); ~CameraDevice(); - inline const char* getId() const { return mCameraId.string(); } + inline const char* getId() const { return mCameraId.c_str(); } camera_status_t createCaptureRequest( ACameraDevice_request_template templateId, diff --git a/camera/ndk/impl/ACameraManager.cpp b/camera/ndk/impl/ACameraManager.cpp index e715c228ae..3ecf845d01 100644 --- a/camera/ndk/impl/ACameraManager.cpp +++ b/camera/ndk/impl/ACameraManager.cpp @@ -167,7 +167,7 @@ sp CameraManagerGlobal::getCameraServiceLocked() { } else { VendorTagDescriptorCache::clearGlobalVendorTagCache(); ALOGE("%s: Failed to setup vendor tag cache: %s", - __FUNCTION__, res.toString8().string()); + __FUNCTION__, res.toString8().c_str()); } } } else if (ret.serviceSpecificErrorCode() == @@ -177,7 +177,7 @@ sp CameraManagerGlobal::getCameraServiceLocked() { VendorTagDescriptor::clearGlobalVendorTagDescriptor(); } else { ALOGE("%s: Failed to get vendor tag descriptors: %s", - __FUNCTION__, ret.toString8().string()); + __FUNCTION__, ret.toString8().c_str()); } } ALOGE_IF(mCameraService == nullptr, "no CameraService!?"); @@ -708,7 +708,7 @@ camera_status_t ACameraManager::getCameraCharacteristics( return ACAMERA_ERROR_INVALID_PARAMETER; default: ALOGE("Get camera characteristics from camera service failed: %s", - serviceRet.toString8().string()); + serviceRet.toString8().c_str()); return ACAMERA_ERROR_UNKNOWN; // should not reach here } } @@ -752,7 +752,7 @@ ACameraManager::openCamera( targetSdkVersion, /*overrideToPortrait*/false, /*out*/&deviceRemote); if (!serviceRet.isOk()) { - ALOGE("%s: connect camera device failed: %s", __FUNCTION__, serviceRet.toString8().string()); + ALOGE("%s: connect camera device failed: %s", __FUNCTION__, serviceRet.toString8().c_str()); // Convert serviceRet to camera_status_t switch(serviceRet.serviceSpecificErrorCode()) { case hardware::ICameraService::ERROR_DISCONNECTED: diff --git a/camera/ndk/impl/ACameraMetadata.cpp b/camera/ndk/impl/ACameraMetadata.cpp index 05124c0ba1..79359098fa 100644 --- a/camera/ndk/impl/ACameraMetadata.cpp +++ b/camera/ndk/impl/ACameraMetadata.cpp @@ -142,7 +142,7 @@ ACameraMetadata::derivePhysicalCameraIds() { if (ids[i] == '\0') { if (start != i) { mStaticPhysicalCameraIdValues.push_back(String8((const char *)ids+start)); - mStaticPhysicalCameraIds.push_back(mStaticPhysicalCameraIdValues.back().string()); + mStaticPhysicalCameraIds.push_back(mStaticPhysicalCameraIdValues.back().c_str()); } start = i+1; } diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 764296efec..28bb781ccc 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -1068,7 +1068,7 @@ Status CameraService::initializeShimMetadata(int cameraId) { /*targetSdkVersion*/ __ANDROID_API_FUTURE__, /*overrideToPortrait*/ true, /*forceSlowJpegMode*/false, /*out*/ tmp) ).isOk()) { - ALOGE("%s: Error initializing shim metadata: %s", __FUNCTION__, ret.toString8().string()); + ALOGE("%s: Error initializing shim metadata: %s", __FUNCTION__, ret.toString8().c_str()); } return ret; } diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp index 68c28e9a89..9dead7f1c4 100644 --- a/services/camera/libcameraservice/api1/Camera2Client.cpp +++ b/services/camera/libcameraservice/api1/Camera2Client.cpp @@ -162,7 +162,7 @@ status_t Camera2Client::initializeImpl(TProviderPtr providerPtr, const std::stri SharedParameters::Lock l(mParameters); ALOGD("%s: Default parameters converted from camera %d:", __FUNCTION__, mCameraId); - ALOGD("%s", l.mParameters.paramsFlattened.string()); + ALOGD("%s", l.mParameters.paramsFlattened.c_str()); } return OK; @@ -221,7 +221,7 @@ status_t Camera2Client::dumpClient(int fd, const Vector& args) { result << fmt::sprintf(" GPS timestamp: %" PRId64 "\n", p.gpsTimestamp); result << fmt::sprintf(" GPS processing method: %s\n", - p.gpsProcessingMethod.string()); + p.gpsProcessingMethod.c_str()); } result << " White balance mode: "; diff --git a/services/camera/libcameraservice/api1/client2/Parameters.cpp b/services/camera/libcameraservice/api1/client2/Parameters.cpp index 23570c2395..d5ea6892cd 100644 --- a/services/camera/libcameraservice/api1/client2/Parameters.cpp +++ b/services/camera/libcameraservice/api1/client2/Parameters.cpp @@ -163,7 +163,7 @@ status_t Parameters::initialize(CameraDeviceBase *device) { availablePreviewSizes[i].width, availablePreviewSizes[i].height); } - ALOGV("Supported preview sizes are: %s", supportedPreviewSizes.string()); + ALOGV("Supported preview sizes are: %s", supportedPreviewSizes.c_str()); params.set(CameraParameters::KEY_SUPPORTED_PREVIEW_SIZES, supportedPreviewSizes); @@ -174,7 +174,7 @@ status_t Parameters::initialize(CameraDeviceBase *device) { availableVideoSizes[i].width, availableVideoSizes[i].height); } - ALOGV("Supported video sizes are: %s", supportedVideoSizes.string()); + ALOGV("Supported video sizes are: %s", supportedVideoSizes.c_str()); params.set(CameraParameters::KEY_SUPPORTED_VIDEO_SIZES, supportedVideoSizes); } @@ -314,7 +314,7 @@ status_t Parameters::initialize(CameraDeviceBase *device) { fps); ALOGV("%s: Supported preview frame rates: %s", - __FUNCTION__, supportedPreviewFrameRates.string()); + __FUNCTION__, supportedPreviewFrameRates.c_str()); } params.set(CameraParameters::KEY_SUPPORTED_PREVIEW_FRAME_RATES, supportedPreviewFrameRates); @@ -2831,7 +2831,7 @@ status_t Parameters::parseAreas(const char *areasCStr, String8 areasStr(areasCStr); ssize_t areaStart = areasStr.find("(", 0) + 1; while (areaStart != 0) { - const char* area = areasStr.string() + areaStart; + const char* area = areasStr.c_str() + areaStart; char *numEnd; int vals[NUM_FIELDS]; for (size_t i = 0; i < NUM_FIELDS; i++) { diff --git a/services/camera/libcameraservice/gui/RingBufferConsumer.cpp b/services/camera/libcameraservice/gui/RingBufferConsumer.cpp index cd4a92c1fa..5dbfb36c7c 100644 --- a/services/camera/libcameraservice/gui/RingBufferConsumer.cpp +++ b/services/camera/libcameraservice/gui/RingBufferConsumer.cpp @@ -25,11 +25,11 @@ #include #include -#define BI_LOGV(x, ...) ALOGV("[%s] " x, mName.string(), ##__VA_ARGS__) -#define BI_LOGD(x, ...) ALOGD("[%s] " x, mName.string(), ##__VA_ARGS__) -#define BI_LOGI(x, ...) ALOGI("[%s] " x, mName.string(), ##__VA_ARGS__) -#define BI_LOGW(x, ...) ALOGW("[%s] " x, mName.string(), ##__VA_ARGS__) -#define BI_LOGE(x, ...) ALOGE("[%s] " x, mName.string(), ##__VA_ARGS__) +#define BI_LOGV(x, ...) ALOGV("[%s] " x, mName.c_str(), ##__VA_ARGS__) +#define BI_LOGD(x, ...) ALOGD("[%s] " x, mName.c_str(), ##__VA_ARGS__) +#define BI_LOGI(x, ...) ALOGI("[%s] " x, mName.c_str(), ##__VA_ARGS__) +#define BI_LOGW(x, ...) ALOGW("[%s] " x, mName.c_str(), ##__VA_ARGS__) +#define BI_LOGE(x, ...) ALOGE("[%s] " x, mName.c_str(), ##__VA_ARGS__) #undef assert #define assert(x) ALOG_ASSERT((x), #x) diff --git a/services/camera/libcameraservice/hidl/HidlCameraService.cpp b/services/camera/libcameraservice/hidl/HidlCameraService.cpp index 0c0fa7ab5f..90ba29455a 100644 --- a/services/camera/libcameraservice/hidl/HidlCameraService.cpp +++ b/services/camera/libcameraservice/hidl/HidlCameraService.cpp @@ -77,7 +77,7 @@ HidlCameraService::getCameraCharacteristics(const hidl_string& cameraId, break; default: ALOGE("Get camera characteristics from camera service failed: %s", - serviceRet.toString8().string()); + serviceRet.toString8().c_str()); status = B2HStatus(serviceRet); } _hidl_cb(status, hidlMetadata); @@ -306,7 +306,7 @@ Return HidlCameraService::getCameraVendorTagSections(getCameraVendorTagSec } hVendorTagSections.resize(numSections); for (size_t s = 0; s < numSections; s++) { - hVendorTagSections[s].sectionName = (*sectionNames)[s].string(); + hVendorTagSections[s].sectionName = (*sectionNames)[s].c_str(); hVendorTagSections[s].tags = tagsBySection[s]; } HProviderIdAndVendorTagSections &hProviderIdAndVendorTagSections =