Use String8/16 c_str [audio]
Bug: 295394788
Test: make checkbuild
Change-Id: Idd3610f6820093bd8710a401f87a136cc26279c5
diff --git a/media/img_utils/src/FileInput.cpp b/media/img_utils/src/FileInput.cpp
index 4c85a51..1eb614b 100644
--- a/media/img_utils/src/FileInput.cpp
+++ b/media/img_utils/src/FileInput.cpp
@@ -33,12 +33,12 @@
status_t FileInput::open() {
if (mOpen) {
- ALOGW("%s: Open called when file %s already open.", __FUNCTION__, mPath.string());
+ ALOGW("%s: Open called when file %s already open.", __FUNCTION__, mPath.c_str());
return OK;
}
mFp = ::fopen(mPath, "rb");
if (!mFp) {
- ALOGE("%s: Could not open file %s", __FUNCTION__, mPath.string());
+ ALOGE("%s: Could not open file %s", __FUNCTION__, mPath.c_str());
return BAD_VALUE;
}
mOpen = true;
@@ -47,14 +47,14 @@
ssize_t FileInput::read(uint8_t* buf, size_t offset, size_t count) {
if (!mOpen) {
- ALOGE("%s: Could not read file %s, file not open.", __FUNCTION__, mPath.string());
+ ALOGE("%s: Could not read file %s, file not open.", __FUNCTION__, mPath.c_str());
return BAD_VALUE;
}
size_t bytesRead = ::fread(buf + offset, sizeof(uint8_t), count, mFp);
int error = ::ferror(mFp);
if (error != 0) {
- ALOGE("%s: Error %d occurred while reading file %s.", __FUNCTION__, error, mPath.string());
+ ALOGE("%s: Error %d occurred while reading file %s.", __FUNCTION__, error, mPath.c_str());
return BAD_VALUE;
}
@@ -68,13 +68,13 @@
status_t FileInput::close() {
if(!mOpen) {
- ALOGW("%s: Close called when file %s already close.", __FUNCTION__, mPath.string());
+ ALOGW("%s: Close called when file %s already close.", __FUNCTION__, mPath.c_str());
return OK;
}
status_t ret = OK;
if(::fclose(mFp) != 0) {
- ALOGE("%s: Failed to close file %s.", __FUNCTION__, mPath.string());
+ ALOGE("%s: Failed to close file %s.", __FUNCTION__, mPath.c_str());
ret = BAD_VALUE;
}
mOpen = false;
diff --git a/media/img_utils/src/FileOutput.cpp b/media/img_utils/src/FileOutput.cpp
index 0346762..5e37324 100644
--- a/media/img_utils/src/FileOutput.cpp
+++ b/media/img_utils/src/FileOutput.cpp
@@ -25,19 +25,19 @@
FileOutput::~FileOutput() {
if (mOpen) {
- ALOGW("%s: Destructor called with %s still open.", __FUNCTION__, mPath.string());
+ ALOGW("%s: Destructor called with %s still open.", __FUNCTION__, mPath.c_str());
close();
}
}
status_t FileOutput::open() {
if (mOpen) {
- ALOGW("%s: Open called when file %s already open.", __FUNCTION__, mPath.string());
+ ALOGW("%s: Open called when file %s already open.", __FUNCTION__, mPath.c_str());
return OK;
}
mFp = ::fopen(mPath, "wb");
if (!mFp) {
- ALOGE("%s: Could not open file %s", __FUNCTION__, mPath.string());
+ ALOGE("%s: Could not open file %s", __FUNCTION__, mPath.c_str());
return BAD_VALUE;
}
mOpen = true;
@@ -46,7 +46,7 @@
status_t FileOutput::write(const uint8_t* buf, size_t offset, size_t count) {
if (!mOpen) {
- ALOGE("%s: Could not write file %s, file not open.", __FUNCTION__, mPath.string());
+ ALOGE("%s: Could not write file %s, file not open.", __FUNCTION__, mPath.c_str());
return BAD_VALUE;
}
@@ -54,7 +54,7 @@
int error = ::ferror(mFp);
if (error != 0) {
- ALOGE("%s: Error %d occurred while writing file %s.", __FUNCTION__, error, mPath.string());
+ ALOGE("%s: Error %d occurred while writing file %s.", __FUNCTION__, error, mPath.c_str());
return BAD_VALUE;
}
return OK;
@@ -62,13 +62,13 @@
status_t FileOutput::close() {
if(!mOpen) {
- ALOGW("%s: Close called when file %s already close.", __FUNCTION__, mPath.string());
+ ALOGW("%s: Close called when file %s already close.", __FUNCTION__, mPath.c_str());
return OK;
}
status_t ret = OK;
if(::fclose(mFp) != 0) {
- ALOGE("%s: Failed to close file %s.", __FUNCTION__, mPath.string());
+ ALOGE("%s: Failed to close file %s.", __FUNCTION__, mPath.c_str());
ret = BAD_VALUE;
}
mOpen = false;
diff --git a/media/img_utils/src/TiffIfd.cpp b/media/img_utils/src/TiffIfd.cpp
index 3fb00cc..b272814 100644
--- a/media/img_utils/src/TiffIfd.cpp
+++ b/media/img_utils/src/TiffIfd.cpp
@@ -377,7 +377,7 @@
size_t s = mEntries.size();
ALOGI("[ifd: %x, num_entries: %zu, entries:\n", getId(), s);
for(size_t i = 0; i < s; ++i) {
- ALOGI("\t%s", mEntries[i]->toString().string());
+ ALOGI("\t%s", mEntries[i]->toString().c_str());
}
ALOGI(", next_ifd: %x]", ((mNextIfd != NULL) ? mNextIfd->getId() : 0));
}
diff --git a/media/libaudioclient/AudioRecord.cpp b/media/libaudioclient/AudioRecord.cpp
index f07ea1d..073a030 100644
--- a/media/libaudioclient/AudioRecord.cpp
+++ b/media/libaudioclient/AudioRecord.cpp
@@ -760,7 +760,7 @@
mInput, mLatency, mSelectedDeviceId, mRoutedDeviceId);
result.appendFormat(" mic direction(%d) mic field dimension(%f)",
mSelectedMicDirection, mSelectedMicFieldDimension);
- ::write(fd, result.string(), result.size());
+ ::write(fd, result.c_str(), result.size());
return NO_ERROR;
}
diff --git a/media/libaudioclient/AudioSystem.cpp b/media/libaudioclient/AudioSystem.cpp
index 763de70..e815190 100644
--- a/media/libaudioclient/AudioSystem.cpp
+++ b/media/libaudioclient/AudioSystem.cpp
@@ -87,7 +87,7 @@
void AudioSystem::setAudioFlingerBinder(const sp<IBinder>& audioFlinger) {
if (audioFlinger->getInterfaceDescriptor() != media::IAudioFlingerService::descriptor) {
ALOGE("setAudioFlingerBinder: received a binder of type %s",
- String8(audioFlinger->getInterfaceDescriptor()).string());
+ String8(audioFlinger->getInterfaceDescriptor()).c_str());
return;
}
Mutex::Autolock _l(gLock);
diff --git a/media/libaudioclient/AudioTrack.cpp b/media/libaudioclient/AudioTrack.cpp
index 4269aa2..69f31fc 100644
--- a/media/libaudioclient/AudioTrack.cpp
+++ b/media/libaudioclient/AudioTrack.cpp
@@ -3036,7 +3036,7 @@
param.addInt(String8(AudioParameter::keyPresentationId), presentationId);
param.addInt(String8(AudioParameter::keyProgramId), programId);
ALOGV("%s(%d): PresentationId/ProgramId[%s]",
- __func__, mPortId, param.toString().string());
+ __func__, mPortId, param.toString().c_str());
status_t status;
mAudioTrack->setParameters(param.toString().c_str(), &status);
@@ -3525,7 +3525,7 @@
mLatency, mSelectedDeviceId, mRoutedDeviceId);
result.appendFormat(" output(%d) AF latency (%u) AF frame count(%zu) AF SampleRate(%u)\n",
mOutput, mAfLatency, mAfFrameCount, mAfSampleRate);
- ::write(fd, result.string(), result.size());
+ ::write(fd, result.c_str(), result.size());
return NO_ERROR;
}
diff --git a/media/libaudiohal/impl/CoreConversionHelperHidl.cpp b/media/libaudiohal/impl/CoreConversionHelperHidl.cpp
index 2ac8a42..bd18902 100644
--- a/media/libaudiohal/impl/CoreConversionHelperHidl.cpp
+++ b/media/libaudiohal/impl/CoreConversionHelperHidl.cpp
@@ -69,7 +69,7 @@
keepValueParam.add(key, value);
key = keepValueParam.toString();
}
- (*hidlKeys)[i] = key.string();
+ (*hidlKeys)[i] = key.c_str();
}
return OK;
}
@@ -84,8 +84,8 @@
String8 key, value;
status_t status = params.getAt(i, key, value);
if (status != OK) return status;
- (*hidlParams)[i].key = key.string();
- (*hidlParams)[i].value = value.string();
+ (*hidlParams)[i].key = key.c_str();
+ (*hidlParams)[i].value = value.c_str();
}
return OK;
}
diff --git a/media/libmediahelper/AudioParameter.cpp b/media/libmediahelper/AudioParameter.cpp
index c081629..f21ea53 100644
--- a/media/libmediahelper/AudioParameter.cpp
+++ b/media/libmediahelper/AudioParameter.cpp
@@ -96,7 +96,7 @@
mKeyValuePairs = keyValuePairs;
char *last;
- strcpy(str, keyValuePairs.string());
+ strcpy(str, keyValuePairs.c_str());
char *pair = strtok_r(str, ";", &last);
while (pair != NULL) {
if (strlen(pair) != 0) {
@@ -208,7 +208,7 @@
value = 0;
if (result == NO_ERROR) {
int val;
- if (sscanf(str8.string(), "%d", &val) == 1) {
+ if (sscanf(str8.c_str(), "%d", &val) == 1) {
value = val;
} else {
result = INVALID_OPERATION;
@@ -224,7 +224,7 @@
value = 0;
if (result == NO_ERROR) {
float val;
- if (sscanf(str8.string(), "%f", &val) == 1) {
+ if (sscanf(str8.c_str(), "%f", &val) == 1) {
value = val;
} else {
result = INVALID_OPERATION;
diff --git a/media/libnblog/PerformanceAnalysis.cpp b/media/libnblog/PerformanceAnalysis.cpp
index e91a511..507295a 100644
--- a/media/libnblog/PerformanceAnalysis.cpp
+++ b/media/libnblog/PerformanceAnalysis.cpp
@@ -409,7 +409,7 @@
// Writes a string into specified file descriptor
void dumpLine(int fd, int indent, const String8 &body) {
- dprintf(fd, "%.*s%s \n", indent, "", body.string());
+ dprintf(fd, "%.*s%s \n", indent, "", body.c_str());
}
} // namespace ReportPerformance
diff --git a/media/libnblog/Reader.cpp b/media/libnblog/Reader.cpp
index d6232d4..a7d6ca2 100644
--- a/media/libnblog/Reader.cpp
+++ b/media/libnblog/Reader.cpp
@@ -283,7 +283,7 @@
break;
}
if (!body.isEmpty()) {
- dprintf(fd, "%.*s%s %s\n", (int)indent, "", timestamp.string(), body.string());
+ dprintf(fd, "%.*s%s %s\n", (int)indent, "", timestamp.c_str(), body.c_str());
body.clear();
}
timestamp.clear();
diff --git a/media/ndk/NdkImageReader.cpp b/media/ndk/NdkImageReader.cpp
index 0f7d98b..7b19ac0 100644
--- a/media/ndk/NdkImageReader.cpp
+++ b/media/ndk/NdkImageReader.cpp
@@ -344,7 +344,7 @@
}
mCbLooper = new ALooper;
- mCbLooper->setName(consumerName.string());
+ mCbLooper->setName(consumerName.c_str());
res = mCbLooper->start(
/*runOnCallingThread*/false,
/*canCallJava*/ true,
diff --git a/media/ndk/NdkMediaDrm.cpp b/media/ndk/NdkMediaDrm.cpp
index 0df7636..28a0233 100644
--- a/media/ndk/NdkMediaDrm.cpp
+++ b/media/ndk/NdkMediaDrm.cpp
@@ -478,7 +478,7 @@
*keyRequest = mObj->mKeyRequest.array();
*keyRequestSize = mObj->mKeyRequest.size();
if (defaultUrl != NULL)
- *defaultUrl = mObj->mDefaultUrl.string();
+ *defaultUrl = mObj->mDefaultUrl.c_str();
switch(requestType) {
case DrmPlugin::kKeyRequestType_Initial:
mObj->mkeyRequestType = KEY_REQUEST_TYPE_INITIAL;
@@ -606,8 +606,8 @@
}
for (size_t i = 0; i < mObj->mQueryResults.size(); i++) {
- keyValuePairs[i].mKey = mObj->mQueryResults.keyAt(i).string();
- keyValuePairs[i].mValue = mObj->mQueryResults.valueAt(i).string();
+ keyValuePairs[i].mKey = mObj->mQueryResults.keyAt(i).c_str();
+ keyValuePairs[i].mValue = mObj->mQueryResults.valueAt(i).c_str();
}
*numPairs = mObj->mQueryResults.size();
return AMEDIA_OK;
@@ -630,7 +630,7 @@
} else {
*provisionRequest = mObj->mProvisionRequest.array();
*provisionRequestSize = mObj->mProvisionRequest.size();
- *serverUrl = mObj->mProvisionUrl.string();
+ *serverUrl = mObj->mProvisionUrl.c_str();
}
return AMEDIA_OK;
}
@@ -714,7 +714,7 @@
mObj->mPropertyString);
if (status == OK) {
- *propertyValue = mObj->mPropertyString.string();
+ *propertyValue = mObj->mPropertyString.c_str();
} else {
*propertyValue = NULL;
}
diff --git a/media/ndk/NdkMediaFormat.cpp b/media/ndk/NdkMediaFormat.cpp
index 66b5dec..161b5e3 100644
--- a/media/ndk/NdkMediaFormat.cpp
+++ b/media/ndk/NdkMediaFormat.cpp
@@ -142,7 +142,7 @@
}
ret.append("}");
mData->mDebug = ret;
- return mData->mDebug.string();
+ return mData->mDebug.c_str();
}
EXPORT
@@ -238,7 +238,7 @@
return false;
}
for (size_t i = 0; i < mData->mStringCache.size(); i++) {
- if (strcmp(mData->mStringCache.keyAt(i).string(), name) == 0) {
+ if (strcmp(mData->mStringCache.keyAt(i).c_str(), name) == 0) {
mData->mStringCache.removeItemsAt(i, 1);
break;
}
@@ -251,7 +251,7 @@
if (i < 0) {
return false;
}
- *out = mData->mStringCache.valueAt(i).string();
+ *out = mData->mStringCache.valueAt(i).c_str();
return true;
}
return false;
diff --git a/media/utils/ServiceUtilities.cpp b/media/utils/ServiceUtilities.cpp
index 83b84e3..eef460f 100644
--- a/media/utils/ServiceUtilities.cpp
+++ b/media/utils/ServiceUtilities.cpp
@@ -403,7 +403,7 @@
PermissionController{}.getPackagesForUid(uid, str16PackageNames);
std::vector<std::string> packageNames;
for (const auto& str16PackageName : str16PackageNames) {
- packageNames.emplace_back(String8(str16PackageName).string());
+ packageNames.emplace_back(String8(str16PackageName).c_str());
}
if (packageNames.empty()) {
ALOGW("%s: Playback capture for uid %u is denied as no package name could be retrieved "
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 761270b..1198787 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -695,7 +695,7 @@
result.appendFormat(" %7d %4d %7d %6u %s\n", r->mSessionid, r->mCnt, r->mPid,
r->mUid, info.package.c_str());
}
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
}
@@ -708,7 +708,7 @@
snprintf(buffer, SIZE, "Hardware status: %d\n", hardwareStatus);
result.append(buffer);
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
dprintf(fd, "Vibrator infos(size=%zu):\n", mAudioVibratorInfos.size());
for (const auto& vibratorInfo : mAudioVibratorInfos) {
@@ -728,7 +728,7 @@
IPCThreadState::self()->getCallingPid(),
IPCThreadState::self()->getCallingUid());
result.append(buffer);
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
}
status_t AudioFlinger::dump(int fd, const Vector<String16>& args)
@@ -741,7 +741,7 @@
const bool hardwareLocked = afutils::dumpTryLock(mHardwareLock);
if (!hardwareLocked) {
String8 result(kHardwareLockedString);
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
} else {
mHardwareLock.unlock();
}
@@ -751,20 +751,20 @@
// failed to lock - AudioFlinger is probably deadlocked
if (!locked) {
String8 result(kDeadlockedString);
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
}
const bool clientLocked = afutils::dumpTryLock(mClientLock);
if (!clientLocked) {
String8 result(kClientLockedString);
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
}
if (mEffectsFactoryHal != 0) {
mEffectsFactoryHal->dumpEffects(fd);
} else {
String8 result(kNoEffectsFactory);
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
}
dumpClients(fd, args);
@@ -1775,7 +1775,7 @@
status_t AudioFlinger::setParameters(audio_io_handle_t ioHandle, const String8& keyValuePairs)
{
ALOGV("setParameters(): io %d, keyvalue %s, calling pid %d calling uid %d",
- ioHandle, keyValuePairs.string(),
+ ioHandle, keyValuePairs.c_str(),
IPCThreadState::self()->getCallingPid(), IPCThreadState::self()->getCallingUid());
// check calling permissions
@@ -1786,7 +1786,7 @@
String8 filteredKeyValuePairs = keyValuePairs;
filterReservedParameters(filteredKeyValuePairs, IPCThreadState::self()->getCallingUid());
- ALOGV("%s: filtered keyvalue %s", __func__, filteredKeyValuePairs.string());
+ ALOGV("%s: filtered keyvalue %s", __func__, filteredKeyValuePairs.c_str());
// AUDIO_IO_HANDLE_NONE means the parameters are global to the audio hardware interface
if (ioHandle == AUDIO_IO_HANDLE_NONE) {
@@ -1861,7 +1861,7 @@
String8 AudioFlinger::getParameters(audio_io_handle_t ioHandle, const String8& keys) const
{
ALOGVV("getParameters() io %d, keys %s, calling pid %d",
- ioHandle, keys.string(), IPCThreadState::self()->getCallingPid());
+ ioHandle, keys.c_str(), IPCThreadState::self()->getCallingPid());
Mutex::Autolock _l(mLock);
@@ -2858,7 +2858,7 @@
deviceType,
flags,
halConfig,
- address.string());
+ address.c_str());
mHardwareStatus = AUDIO_HW_IDLE;
diff --git a/services/audioflinger/DeviceEffectManager.cpp b/services/audioflinger/DeviceEffectManager.cpp
index 681ec5f..588616d 100644
--- a/services/audioflinger/DeviceEffectManager.cpp
+++ b/services/audioflinger/DeviceEffectManager.cpp
@@ -206,17 +206,17 @@
const bool locked = afutils::dumpTryLock(mLock);
if (!locked) {
String8 result("DeviceEffectManager may be deadlocked\n");
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
}
String8 heading("\nDevice Effects:\n");
- write(fd, heading.string(), heading.size());
+ write(fd, heading.c_str(), heading.size());
for (const auto& iter : mDeviceEffects) {
String8 outStr;
outStr.appendFormat("%*sEffect for device %s address %s:\n", 2, "",
::android::toString(iter.first.mType).c_str(), iter.first.getAddress());
for (const auto& effect : iter.second) {
- write(fd, outStr.string(), outStr.size());
+ write(fd, outStr.c_str(), outStr.size());
effect->dump2(fd, 4);
}
}
diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index c3e1fba..610ce26 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -530,7 +530,7 @@
result.appendFormat("\t\t- apiVersion: %08X\n\t\t- flags: %08X (%s)\n",
mDescriptor.apiVersion,
mDescriptor.flags,
- effectFlagsToString(mDescriptor.flags).string());
+ effectFlagsToString(mDescriptor.flags).c_str());
result.appendFormat("\t\t- name: %s\n",
mDescriptor.name);
@@ -551,7 +551,7 @@
mLock.unlock();
}
- write(fd, result.string(), result.length());
+ write(fd, result.c_str(), result.length());
}
// ----------------------------------------------------------------------------
@@ -1660,7 +1660,7 @@
dumpInOutBuffer(false /* isInput */, mOutBuffer).c_str(),
dumpInOutBuffer(false /* isInput */, mOutConversionBuffer).c_str());
- write(fd, result.string(), result.length());
+ write(fd, result.c_str(), result.length());
if (mEffectInterface != 0) {
dprintf(fd, "\tEffect ID %d HAL dump:\n", mId);
@@ -2661,7 +2661,7 @@
(int)outBufferStr.size(), "Out buffer ");
result.appendFormat("\t%s %s %d\n",
inBufferStr.c_str(), outBufferStr.c_str(), mActiveTrackCnt);
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
for (size_t i = 0; i < numEffects; ++i) {
sp<IAfEffectModule> effect = mEffects[i];
@@ -2674,7 +2674,7 @@
mLock.unlock();
}
} else {
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
}
}
@@ -3527,7 +3527,7 @@
const bool locked = afutils::dumpTryLock(mProxyLock);
if (!locked) {
String8 result("DeviceEffectProxy may be deadlocked\n");
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
}
String8 outStr;
@@ -3536,16 +3536,16 @@
} else {
outStr.appendFormat("%*sNO HAL Effect\n", spaces, "");
}
- write(fd, outStr.string(), outStr.size());
+ write(fd, outStr.c_str(), outStr.size());
outStr.clear();
outStr.appendFormat("%*sSub Effects:\n", spaces, "");
- write(fd, outStr.string(), outStr.size());
+ write(fd, outStr.c_str(), outStr.size());
outStr.clear();
for (const auto& iter : mEffectHandles) {
outStr.appendFormat("%*sEffect for patch handle %d:\n", spaces + 2, "", iter.first);
- write(fd, outStr.string(), outStr.size());
+ write(fd, outStr.c_str(), outStr.size());
outStr.clear();
sp<IAfEffectBase> effect = iter.second->effect().promote();
if (effect != nullptr) {
diff --git a/services/audioflinger/PatchPanel.cpp b/services/audioflinger/PatchPanel.cpp
index f11a530..c477c93 100644
--- a/services/audioflinger/PatchPanel.cpp
+++ b/services/audioflinger/PatchPanel.cpp
@@ -915,7 +915,7 @@
patchPanelDump += "\nPatches:\n";
headerPrinted = true;
}
- patchPanelDump.appendFormat("%s%s\n", indent, iter.second.dump(iter.first).string());
+ patchPanelDump.appendFormat("%s%s\n", indent, iter.second.dump(iter.first).c_str());
}
headerPrinted = false;
@@ -933,12 +933,12 @@
for (const auto& patch : module.second.sw_patches) {
moduleDump.appendFormat("%d ", patch);
}
- patchPanelDump.appendFormat("%s%s\n", indent, moduleDump.string());
+ patchPanelDump.appendFormat("%s%s\n", indent, moduleDump.c_str());
}
}
if (!patchPanelDump.isEmpty()) {
- write(fd, patchPanelDump.string(), patchPanelDump.size());
+ write(fd, patchPanelDump.c_str(), patchPanelDump.size());
}
}
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index a36494c..157764f 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -570,7 +570,7 @@
" us per mix loop: mean=%.0f stddev=%.0f min=%.0f max=%.0f\n"
" %% of wall: mean=%.1f stddev=%.1f min=%.1f max=%.1f\n"
" MHz: mean=%.1f, stddev=%.1f, min=%.1f max=%.1f",
- title.string(),
+ title.c_str(),
elapsed * .000000001, n, perLoop * .000001,
mean * .001,
stddev * .001,
@@ -696,7 +696,7 @@
status_t ThreadBase::setParameters(const String8& keyValuePairs)
{
- ALOGV("ThreadBase::setParameters() %s", keyValuePairs.string());
+ ALOGV("ThreadBase::setParameters() %s", keyValuePairs.c_str());
Mutex::Autolock _l(mLock);
return sendSetParameterConfigEvent_l(keyValuePairs);
@@ -881,7 +881,7 @@
if (checkForNewParameter_l(data->mKeyValuePairs, event->mStatus)) {
configChanged = true;
mLocalLog.log("CFG_EVENT_SET_PARAMETER: (%s) configuration changed",
- data->mKeyValuePairs.string());
+ data->mKeyValuePairs.c_str());
}
} break;
case CFG_EVENT_CREATE_AUDIO_PATCH: {
@@ -1069,7 +1069,7 @@
dprintf(fd, " HAL buffer size: %zu bytes\n", mBufferSize);
dprintf(fd, " Channel count: %u\n", mChannelCount);
dprintf(fd, " Channel mask: 0x%08x (%s)\n", mChannelMask,
- channelMaskToString(mChannelMask, mType != RECORD).string());
+ channelMaskToString(mChannelMask, mType != RECORD).c_str());
dprintf(fd, " Processing format: 0x%x (%s)\n", mFormat,
IAfThreadBase::formatToString(mFormat).c_str());
dprintf(fd, " Processing frame size: %zu bytes\n", mFrameSize);
@@ -2005,7 +2005,7 @@
if (mLocalLog != nullptr) {
String8 result;
track->appendDump(result, false /* active */);
- mLocalLog->log("AT::%-10s(%p) %s", funcName, track.get(), result.string());
+ mLocalLog->log("AT::%-10s(%p) %s", funcName, track.get(), result.c_str());
}
}
@@ -2272,7 +2272,7 @@
}
}
result.append("\n");
- write(fd, result.string(), result.length());
+ write(fd, result.c_str(), result.length());
result.clear();
// These values are "raw"; they will wrap around. See prepareTracks_l() for a better way.
@@ -2318,7 +2318,7 @@
}
}
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
}
void PlaybackThread::dumpInternals_l(int fd, const Vector<String16>& args)
@@ -2966,7 +2966,7 @@
String8 result;
track->appendDump(result, false /* active */);
- mLocalLog.log("removeTrack_l (%p) %s", track.get(), result.string());
+ mLocalLog.log("removeTrack_l (%p) %s", track.get(), result.c_str());
mTracks.remove(track);
{
@@ -4075,9 +4075,9 @@
releaseWakeLock_l();
// wait until we have something to do...
- ALOGV("%s going to sleep", myName.string());
+ ALOGV("%s going to sleep", myName.c_str());
mWaitWorkCV.wait(mLock);
- ALOGV("%s waking up", myName.string());
+ ALOGV("%s waking up", myName.c_str());
acquireWakeLock_l();
mMixerStatus = MIXER_IDLE;
@@ -9178,7 +9178,7 @@
{
String8 result;
track->appendDump(result, false /* active */);
- mLocalLog.log("removeTrack_l (%p) %s", track.get(), result.string());
+ mLocalLog.log("removeTrack_l (%p) %s", track.get(), result.c_str());
mTracks.remove(track);
// need anything related to effects here?
@@ -9257,7 +9257,7 @@
}
}
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
}
void RecordThread::setRecordSilenced(audio_port_handle_t portId, bool silenced)
@@ -10345,9 +10345,9 @@
}
// wait until we have something to do...
- ALOGV("%s going to sleep", myName.string());
+ ALOGV("%s going to sleep", myName.c_str());
mWaitWorkCV.wait(mLock);
- ALOGV("%s waking up", myName.string());
+ ALOGV("%s waking up", myName.c_str());
checkSilentMode_l();
@@ -10721,7 +10721,7 @@
} else {
dprintf(fd, "\n");
}
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
}
/* static */
diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h
index 79f75ca..18b6840 100644
--- a/services/audioflinger/Threads.h
+++ b/services/audioflinger/Threads.h
@@ -170,7 +170,7 @@
mKeyValuePairs(keyValuePairs) {}
virtual void dump(char *buffer, size_t size) {
- snprintf(buffer, size, "- KeyValue: %s\n", mKeyValuePairs.string());
+ snprintf(buffer, size, "- KeyValue: %s\n", mKeyValuePairs.c_str());
}
const String8 mKeyValuePairs;
diff --git a/services/audiopolicy/common/managerdefinitions/include/HwModule.h b/services/audiopolicy/common/managerdefinitions/include/HwModule.h
index e994758..cf20260 100644
--- a/services/audiopolicy/common/managerdefinitions/include/HwModule.h
+++ b/services/audiopolicy/common/managerdefinitions/include/HwModule.h
@@ -43,7 +43,7 @@
HwModule(const char *name, uint32_t halVersion = 0);
~HwModule();
- const char *getName() const { return mName.string(); }
+ const char *getName() const { return mName.c_str(); }
const DeviceVector &getDeclaredDevices() const { return mDeclaredDevices; }
void setDeclaredDevices(const DeviceVector &devices);
diff --git a/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp b/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp
index 0f9cc89..c42f9c3 100644
--- a/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp
@@ -138,7 +138,7 @@
dst->appendFormat("%*s- device type: %s\n", spaces, "", toString(mDeviceType).c_str());
- dst->appendFormat("%*s- device address: %s\n", spaces, "", mDeviceAddress.string());
+ dst->appendFormat("%*s- device address: %s\n", spaces, "", mDeviceAddress.c_str());
dst->appendFormat("%*s- output: %d\n", spaces, "",
mOutput == nullptr ? 0 : mOutput->mIoHandle);
@@ -186,7 +186,7 @@
&& mix.mDeviceAddress.compare(registeredMix->mDeviceAddress) == 0
&& is_mix_loopback(mix.mRouteFlags)) {
ALOGE("registerMix(): mix already registered for dev=0x%x addr=%s",
- mix.mDeviceType, mix.mDeviceAddress.string());
+ mix.mDeviceType, mix.mDeviceAddress.c_str());
return BAD_VALUE;
}
}
@@ -198,7 +198,7 @@
sp<AudioPolicyMix> policyMix = sp<AudioPolicyMix>::make(mix);
add(policyMix);
ALOGD("registerMix(): adding mix for dev=0x%x addr=%s",
- policyMix->mDeviceType, policyMix->mDeviceAddress.string());
+ policyMix->mDeviceType, policyMix->mDeviceAddress.c_str());
if (desc != nullptr) {
desc->mPolicyMix = policyMix;
@@ -214,14 +214,14 @@
if (mix.mDeviceType == registeredMix->mDeviceType
&& mix.mDeviceAddress.compare(registeredMix->mDeviceAddress) == 0) {
ALOGD("unregisterMix(): removing mix for dev=0x%x addr=%s",
- mix.mDeviceType, mix.mDeviceAddress.string());
+ mix.mDeviceType, mix.mDeviceAddress.c_str());
removeAt(i);
return NO_ERROR;
}
}
ALOGE("unregisterMix(): mix not registered for dev=0x%x addr=%s",
- mix.mDeviceType, mix.mDeviceAddress.string());
+ mix.mDeviceType, mix.mDeviceAddress.c_str());
return BAD_VALUE;
}
@@ -229,20 +229,20 @@
const String8& address, sp<AudioPolicyMix> &policyMix) const
{
- ALOGV("getAudioPolicyMix() for dev=0x%x addr=%s", deviceType, address.string());
+ ALOGV("getAudioPolicyMix() for dev=0x%x addr=%s", deviceType, address.c_str());
for (ssize_t i = 0; i < size(); i++) {
// Workaround: when an in audio policy is registered, it opens an output
// that tries to find the audio policy, thus the device must be ignored.
if (itemAt(i)->mDeviceAddress.compare(address) == 0) {
policyMix = itemAt(i);
ALOGV("getAudioPolicyMix: found mix %zu match (devType=0x%x addr=%s)",
- i, deviceType, address.string());
+ i, deviceType, address.c_str());
return NO_ERROR;
}
}
ALOGE("getAudioPolicyMix(): mix not registered for dev=0x%x addr=%s",
- deviceType, address.string());
+ deviceType, address.c_str());
return BAD_VALUE;
}
@@ -457,7 +457,7 @@
address->c_str(), attr.source);
for (size_t i = 0; i < size(); i++) {
const sp<AudioPolicyMix> audioPolicyMix = itemAt(i);
- ALOGV("\tmix %zu address=%s", i, audioPolicyMix->mDeviceAddress.string());
+ ALOGV("\tmix %zu address=%s", i, audioPolicyMix->mDeviceAddress.c_str());
}
#endif
@@ -466,7 +466,7 @@
const sp<AudioPolicyMix>& registeredMix = itemAt(index);
if (address->compare(registeredMix->mDeviceAddress.c_str()) == 0) {
ALOGD("getInputMixForAttr found addr=%s dev=0x%x",
- registeredMix->mDeviceAddress.string(), registeredMix->mDeviceType);
+ registeredMix->mDeviceAddress.c_str(), registeredMix->mDeviceType);
break;
}
}
@@ -515,7 +515,7 @@
}
// check if this mix goes to a device in the list of devices
bool deviceMatch = false;
- const AudioDeviceTypeAddr mixDevice(mix->mDeviceType, mix->mDeviceAddress.string());
+ const AudioDeviceTypeAddr mixDevice(mix->mDeviceType, mix->mDeviceAddress.c_str());
for (size_t j = 0; j < devices.size(); j++) {
if (mixDevice.equals(devices[j])) {
deviceMatch = true;
@@ -571,7 +571,7 @@
}
}
if (ruleAllowsUid) {
- devices.add(AudioDeviceTypeAddr(mix->mDeviceType, mix->mDeviceAddress.string()));
+ devices.add(AudioDeviceTypeAddr(mix->mDeviceType, mix->mDeviceAddress.c_str()));
}
}
return NO_ERROR;
@@ -606,7 +606,7 @@
}
// check if this mix goes to a device in the list of devices
bool deviceMatch = false;
- const AudioDeviceTypeAddr mixDevice(mix->mDeviceType, mix->mDeviceAddress.string());
+ const AudioDeviceTypeAddr mixDevice(mix->mDeviceType, mix->mDeviceAddress.c_str());
for (size_t j = 0; j < devices.size(); j++) {
if (mixDevice.equals(devices[j])) {
deviceMatch = true;
@@ -668,7 +668,7 @@
}
}
if (ruleAllowsUserId) {
- devices.push_back(AudioDeviceTypeAddr(mix->mDeviceType, mix->mDeviceAddress.string()));
+ devices.push_back(AudioDeviceTypeAddr(mix->mDeviceType, mix->mDeviceAddress.c_str()));
}
}
return NO_ERROR;
diff --git a/services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp b/services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp
index a909331..62e5bd4 100644
--- a/services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp
@@ -185,7 +185,7 @@
}
std::string descBaseDumpStr;
- DeviceDescriptorBase::dump(&descBaseDumpStr, spaces, extraInfo.string(), verbose);
+ DeviceDescriptorBase::dump(&descBaseDumpStr, spaces, extraInfo.c_str(), verbose);
dst->append(descBaseDumpStr.c_str());
}
@@ -325,7 +325,7 @@
}
}
ALOGV("DeviceVector::%s() for type %08x address \"%s\" found %p format %08x",
- __func__, type, address.string(), device.get(), format);
+ __func__, type, address.c_str(), device.get(), format);
return device;
}
@@ -448,7 +448,7 @@
if (isEmpty()) {
return;
}
- dst->appendFormat("%*s%s devices (%zu):\n", spaces, "", tag.string(), size());
+ dst->appendFormat("%*s%s devices (%zu):\n", spaces, "", tag.c_str(), size());
for (size_t i = 0; i < size(); i++) {
const std::string prefix = base::StringPrintf("%*s %zu. ", spaces, "", i + 1);
dst->appendFormat("%s", prefix.c_str());
diff --git a/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp b/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
index 95f8d14..2c8e50b 100644
--- a/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp
@@ -67,7 +67,7 @@
config->sample_rate));
sp<DeviceDescriptor> devDesc =
- new DeviceDescriptor(device, getTagForDevice(device), address.string());
+ new DeviceDescriptor(device, getTagForDevice(device), address.c_str());
addDynamicDevice(devDesc);
// Reciprocally attach the device to the module
devDesc->attach(this);
@@ -135,7 +135,7 @@
config->sample_rate));
sp<DeviceDescriptor> devDesc =
- new DeviceDescriptor(device, getTagForDevice(device), address.string());
+ new DeviceDescriptor(device, getTagForDevice(device), address.c_str());
addDynamicDevice(devDesc);
// Reciprocally attach the device to the module
devDesc->attach(this);
@@ -375,7 +375,7 @@
if (allowToCreate) {
moduleDevice->attach(hwModule);
// Name may be overwritten, restored on detach.
- moduleDevice->setAddress(devAddress.string());
+ moduleDevice->setAddress(devAddress.c_str());
// Name may be overwritten, restored on detach.
moduleDevice->setName(name);
}
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index d5505b5..5a15497 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -277,7 +277,7 @@
sp<AudioPolicyMix> policyMix = desc->mPolicyMix.promote();
if (policyMix != nullptr
&& policyMix->mMixType == MIX_TYPE_RECORDERS
- && device->address() == policyMix->mDeviceAddress.string()) {
+ && device->address() == policyMix->mDeviceAddress.c_str()) {
doCheckForDeviceAndOutputChanges = false;
break;
}
@@ -2242,7 +2242,7 @@
const char *address = NULL;
if (policyMix != nullptr) {
audio_devices_t newDeviceType;
- address = policyMix->mDeviceAddress.string();
+ address = policyMix->mDeviceAddress.c_str();
if ((policyMix->mRouteFlags & MIX_ROUTE_FLAG_LOOP_BACK) == MIX_ROUTE_FLAG_LOOP_BACK) {
newDeviceType = AUDIO_DEVICE_OUT_REMOTE_SUBMIX;
} else {
@@ -3640,7 +3640,7 @@
}
if (mPolicyMixes.registerMix(mix, 0 /*output desc*/) != NO_ERROR) {
- ALOGE("Error registering mix %zu for address %s", i, address.string());
+ ALOGE("Error registering mix %zu for address %s", i, address.c_str());
res = INVALID_OPERATION;
break;
}
@@ -3657,16 +3657,16 @@
if ((res = setDeviceConnectionStateInt(deviceTypeToMakeAvailable,
AUDIO_POLICY_DEVICE_STATE_AVAILABLE,
- address.string(), "remote-submix", AUDIO_FORMAT_DEFAULT)) != NO_ERROR) {
+ address.c_str(), "remote-submix", AUDIO_FORMAT_DEFAULT)) != NO_ERROR) {
ALOGE("Failed to set remote submix device available, type %u, address %s",
- mix.mDeviceType, address.string());
+ mix.mDeviceType, address.c_str());
break;
}
} else if ((mix.mRouteFlags & MIX_ROUTE_FLAG_RENDER) == MIX_ROUTE_FLAG_RENDER) {
String8 address = mix.mDeviceAddress;
audio_devices_t type = mix.mDeviceType;
ALOGV(" registerPolicyMixes() mix %zu of %zu is RENDER, dev=0x%X addr=%s",
- i, mixes.size(), type, address.string());
+ i, mixes.size(), type, address.c_str());
sp<DeviceDescriptor> device = mHwModules.getDeviceDescriptor(
mix.mDeviceType, mix.mDeviceAddress,
@@ -3684,7 +3684,7 @@
if (!desc->isDuplicated() && desc->supportedDevices().contains(device)) {
if (mPolicyMixes.registerMix(mix, desc) != NO_ERROR) {
ALOGE("Could not register mix RENDER, dev=0x%X addr=%s", type,
- address.string());
+ address.c_str());
res = INVALID_OPERATION;
} else {
foundOutput = true;
@@ -3701,7 +3701,7 @@
if (profile->isDirectOutput() && profile->supportsDevice(device)) {
if (mPolicyMixes.registerMix(mix, nullptr) != NO_ERROR) {
ALOGE("Could not register mix RENDER, dev=0x%X addr=%s", type,
- address.string());
+ address.c_str());
res = INVALID_OPERATION;
} else {
foundOutput = true;
@@ -3711,12 +3711,12 @@
}
if (res != NO_ERROR) {
ALOGE(" Error registering mix %zu for device 0x%X addr %s",
- i, type, address.string());
+ i, type, address.c_str());
res = INVALID_OPERATION;
break;
} else if (!foundOutput) {
ALOGE(" Output not found for mix %zu for device 0x%X addr %s",
- i, type, address.string());
+ i, type, address.c_str());
res = INVALID_OPERATION;
break;
} else {
@@ -3760,14 +3760,14 @@
}
for (auto device : {AUDIO_DEVICE_IN_REMOTE_SUBMIX, AUDIO_DEVICE_OUT_REMOTE_SUBMIX}) {
- if (getDeviceConnectionState(device, address.string()) ==
+ if (getDeviceConnectionState(device, address.c_str()) ==
AUDIO_POLICY_DEVICE_STATE_AVAILABLE) {
res = setDeviceConnectionStateInt(device, AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE,
- address.string(), "remote-submix",
+ address.c_str(), "remote-submix",
AUDIO_FORMAT_DEFAULT);
if (res != OK) {
ALOGE("Error making RemoteSubmix device unavailable for mix "
- "with type %d, address %s", device, address.string());
+ "with type %d, address %s", device, address.c_str());
}
}
}
@@ -4231,7 +4231,7 @@
{
String8 result;
dump(&result);
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
return NO_ERROR;
}
@@ -6454,7 +6454,7 @@
}
ALOGV("opening output for device %08x with params %s profile %p name %s",
- deviceType, address.string(), profile.get(), profile->getName().c_str());
+ deviceType, address.c_str(), profile.get(), profile->getName().c_str());
desc = openOutputWithProfileAndDevice(profile, DeviceVector(device));
audio_io_handle_t output = desc == nullptr ? AUDIO_IO_HANDLE_NONE : desc->mIoHandle;
if (output == AUDIO_IO_HANDLE_NONE) {
@@ -8167,12 +8167,12 @@
if (profiles.hasDynamicFormat()) {
reply = mpClientInterface->getParameters(
ioHandle, String8(AudioParameter::keyStreamSupportedFormats));
- ALOGV("%s: supported formats %d, %s", __FUNCTION__, ioHandle, reply.string());
+ ALOGV("%s: supported formats %d, %s", __FUNCTION__, ioHandle, reply.c_str());
AudioParameter repliedParameters(reply);
FormatVector formats;
if (repliedParameters.get(
String8(AudioParameter::keyStreamSupportedFormats), reply) == NO_ERROR) {
- formats = formatsFromString(reply.string());
+ formats = formatsFromString(reply.c_str());
} else if (devDesc->hasValidAudioProfile()) {
ALOGD("%s: using the device profiles", __func__);
formats = devDesc->getAudioProfiles().getSupportedFormats();
@@ -8199,11 +8199,11 @@
ioHandle,
requestedParameters.toString() + ";" +
AudioParameter::keyStreamSupportedSamplingRates);
- ALOGV("%s: supported sampling rates %s", __FUNCTION__, reply.string());
+ ALOGV("%s: supported sampling rates %s", __FUNCTION__, reply.c_str());
AudioParameter repliedParameters(reply);
if (repliedParameters.get(
String8(AudioParameter::keyStreamSupportedSamplingRates), reply) == NO_ERROR) {
- samplingRates = samplingRatesFromString(reply.string());
+ samplingRates = samplingRatesFromString(reply.c_str());
} else {
samplingRates = devDesc->getAudioProfiles().getSampleRatesFor(format);
}
@@ -8212,11 +8212,11 @@
reply = mpClientInterface->getParameters(ioHandle,
requestedParameters.toString() + ";" +
AudioParameter::keyStreamSupportedChannels);
- ALOGV("%s: supported channel masks %s", __FUNCTION__, reply.string());
+ ALOGV("%s: supported channel masks %s", __FUNCTION__, reply.c_str());
AudioParameter repliedParameters(reply);
if (repliedParameters.get(
String8(AudioParameter::keyStreamSupportedChannels), reply) == NO_ERROR) {
- channelMasks = channelMasksFromString(reply.string());
+ channelMasks = channelMasksFromString(reply.c_str());
} else {
channelMasks = devDesc->getAudioProfiles().getChannelMasksFor(format);
}
@@ -8390,7 +8390,7 @@
desc->mPolicyMix = policyMix;
} else {
ALOGW("checkOutputsForDevice() cannot find policy for address %s",
- address.string());
+ address.c_str());
}
} else if (hasPrimaryOutput() && speaker != nullptr
diff --git a/services/audiopolicy/service/AudioPolicyClientImpl.cpp b/services/audiopolicy/service/AudioPolicyClientImpl.cpp
index 13e682b..2874824 100644
--- a/services/audiopolicy/service/AudioPolicyClientImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyClientImpl.cpp
@@ -190,7 +190,7 @@
const String8& keyValuePairs,
int delay_ms)
{
- mAudioPolicyService->setParameters(io_handle, keyValuePairs.string(), delay_ms);
+ mAudioPolicyService->setParameters(io_handle, keyValuePairs.c_str(), delay_ms);
}
String8 AudioPolicyService::AudioPolicyClient::getParameters(audio_io_handle_t io_handle,
diff --git a/services/audiopolicy/service/AudioPolicyService.cpp b/services/audiopolicy/service/AudioPolicyService.cpp
index 72fa245..4133526 100644
--- a/services/audiopolicy/service/AudioPolicyService.cpp
+++ b/services/audiopolicy/service/AudioPolicyService.cpp
@@ -467,7 +467,7 @@
void AudioPolicyService::onDynamicPolicyMixStateUpdate(const String8& regId, int32_t state)
{
ALOGV("AudioPolicyService::onDynamicPolicyMixStateUpdate(%s, %d)",
- regId.string(), state);
+ regId.c_str(), state);
mOutputCommandThread->dynamicPolicyMixStateUpdateCommand(regId, state);
}
@@ -811,7 +811,7 @@
msg << std::endl;
result.append(msg.str().c_str());
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
mUidPolicy->dumpInternals(fd);
return NO_ERROR;
@@ -1205,19 +1205,19 @@
const bool locked = dumpTryLock(mLock);
if (!locked) {
String8 result(kDeadlockedString);
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
}
dumpInternals(fd);
String8 actPtr = String8::format("AudioCommandThread: %p\n", mAudioCommandThread.get());
- write(fd, actPtr.string(), actPtr.size());
+ write(fd, actPtr.c_str(), actPtr.size());
if (mAudioCommandThread != 0) {
mAudioCommandThread->dump(fd);
}
String8 octPtr = String8::format("OutputCommandThread: %p\n", mOutputCommandThread.get());
- write(fd, octPtr.string(), octPtr.size());
+ write(fd, octPtr.c_str(), octPtr.size());
if (mOutputCommandThread != 0) {
mOutputCommandThread->dump(fd);
}
@@ -1226,7 +1226,7 @@
mAudioPolicyManager->dump(fd);
} else {
String8 apmPtr = String8::format("AudioPolicyManager: %p\n", mAudioPolicyManager);
- write(fd, apmPtr.string(), apmPtr.size());
+ write(fd, apmPtr.c_str(), apmPtr.size());
}
mPackageManager.dump(fd);
@@ -1260,7 +1260,7 @@
IPCThreadState::self()->getCallingPid(),
IPCThreadState::self()->getCallingUid());
result.append(buffer);
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
return NO_ERROR;
}
@@ -1439,8 +1439,8 @@
PermissionController pc;
uid = pc.getPackageUid(packageName, 0);
if (uid <= 0) {
- ALOGE("Unknown package: '%s'", String8(packageName).string());
- dprintf(err, "Unknown package: '%s'\n", String8(packageName).string());
+ ALOGE("Unknown package: '%s'", String8(packageName).c_str());
+ dprintf(err, "Unknown package: '%s'\n", String8(packageName).c_str());
return BAD_VALUE;
}
@@ -1459,7 +1459,7 @@
if (args[2] == String16("active")) {
active = true;
} else if ((args[2] != String16("idle"))) {
- ALOGE("Expected active or idle but got: '%s'", String8(args[2]).string());
+ ALOGE("Expected active or idle but got: '%s'", String8(args[2]).c_str());
return BAD_VALUE;
}
@@ -1839,7 +1839,7 @@
snprintf(buffer, SIZE, "\tIs RTT Enabled: %s\n", (mRttEnabled ? "True":"False"));
result.append(buffer);
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
}
// ----------- AudioPolicyService::SensorPrivacyService implementation ----------
@@ -1880,14 +1880,14 @@
AudioPolicyService::AudioCommandThread::~AudioCommandThread()
{
if (!mAudioCommands.isEmpty()) {
- release_wake_lock(mName.string());
+ release_wake_lock(mName.c_str());
}
mAudioCommands.clear();
}
void AudioPolicyService::AudioCommandThread::onFirstRef()
{
- run(mName.string(), ANDROID_PRIORITY_AUDIO);
+ run(mName.c_str(), ANDROID_PRIORITY_AUDIO);
}
bool AudioPolicyService::AudioCommandThread::threadLoop()
@@ -1924,7 +1924,7 @@
case SET_PARAMETERS: {
ParametersData *data = (ParametersData *)command->mParam.get();
ALOGV("AudioCommandThread() processing set parameters string %s, io %d",
- data->mKeyValuePairs.string(), data->mIO);
+ data->mKeyValuePairs.c_str(), data->mIO);
mLock.unlock();
command->mStatus = AudioSystem::setParameters(data->mIO, data->mKeyValuePairs);
mLock.lock();
@@ -2033,7 +2033,7 @@
DynPolicyMixStateUpdateData *data =
(DynPolicyMixStateUpdateData *)command->mParam.get();
ALOGV("AudioCommandThread() processing dyn policy mix state update %s %d",
- data->mRegId.string(), data->mState);
+ data->mRegId.c_str(), data->mState);
svc = mService.promote();
if (svc == 0) {
break;
@@ -2158,7 +2158,7 @@
// release delayed commands wake lock as many times as we made the queue is
// empty during popping.
while (numTimesBecameEmpty--) {
- release_wake_lock(mName.string());
+ release_wake_lock(mName.c_str());
}
// At this stage we have either an empty command queue or the first command in the queue
@@ -2174,7 +2174,7 @@
}
// release delayed commands wake lock before quitting
if (!mAudioCommands.isEmpty()) {
- release_wake_lock(mName.string());
+ release_wake_lock(mName.c_str());
}
mLock.unlock();
return false;
@@ -2189,7 +2189,7 @@
const bool locked = dumpTryLock(mLock);
if (!locked) {
String8 result2(kCmdDeadlockedString);
- write(fd, result2.string(), result2.size());
+ write(fd, result2.c_str(), result2.size());
}
snprintf(buffer, SIZE, "- Commands:\n");
@@ -2207,7 +2207,7 @@
result.append(" none\n");
}
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
dumpReleaseLock(mLock, locked);
@@ -2394,7 +2394,7 @@
data->mState = state;
command->mParam = data;
ALOGV("AudioCommandThread() sending dynamic policy mix (id=%s) state update to %d",
- regId.string(), state);
+ regId.c_str(), state);
sendCommand(command);
}
@@ -2491,7 +2491,7 @@
// acquire wake lock to make sure delayed commands are processed
if (mAudioCommands.isEmpty()) {
- acquire_wake_lock(PARTIAL_WAKE_LOCK, mName.string());
+ acquire_wake_lock(PARTIAL_WAKE_LOCK, mName.c_str());
}
// check same pending commands with later time stamps and eliminate them
@@ -2516,7 +2516,7 @@
ParametersData *data2 = (ParametersData *)command2->mParam.get();
if (data->mIO != data2->mIO) break;
ALOGV("Comparing parameter command %s to new command %s",
- data2->mKeyValuePairs.string(), data->mKeyValuePairs.string());
+ data2->mKeyValuePairs.c_str(), data->mKeyValuePairs.c_str());
AudioParameter param = AudioParameter(data->mKeyValuePairs);
AudioParameter param2 = AudioParameter(data2->mKeyValuePairs);
for (size_t j = 0; j < param.size(); j++) {
@@ -2529,7 +2529,7 @@
param2.getAt(k, key2, value2);
if (key2 == key) {
param2.remove(key2);
- ALOGV("Filtering out parameter %s", key2.string());
+ ALOGV("Filtering out parameter %s", key2.c_str());
break;
}
}
diff --git a/services/medialog/MediaLogService.cpp b/services/medialog/MediaLogService.cpp
index 902af66..abe5f16 100644
--- a/services/medialog/MediaLogService.cpp
+++ b/services/medialog/MediaLogService.cpp
@@ -107,7 +107,7 @@
if (args.size() > 0) {
const String8 arg0(args[0]);
- if (!strcmp(arg0.string(), "-r")) {
+ if (!strcmp(arg0.c_str(), "-r")) {
// needed because mReaders is protected by mLock
bool locked = dumpTryLock(mLock);
@@ -115,9 +115,9 @@
if (!locked) {
String8 result(kDeadlockedString);
if (fd >= 0) {
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
} else {
- ALOGW("%s:", result.string());
+ ALOGW("%s:", result.c_str());
}
return NO_ERROR;
}
diff --git a/services/mediametrics/MediaMetricsService.cpp b/services/mediametrics/MediaMetricsService.cpp
index af1372b..1b5255a 100644
--- a/services/mediametrics/MediaMetricsService.cpp
+++ b/services/mediametrics/MediaMetricsService.cpp
@@ -278,14 +278,14 @@
} else if (args[i] == prefixOption) {
++i;
if (i < n) {
- prefix = String8(args[i]).string();
+ prefix = String8(args[i]).c_str();
}
} else if (args[i] == sinceOption) {
++i;
if (i < n) {
String8 value(args[i]);
char *endp;
- const char *p = value.string();
+ const char *p = value.c_str();
const auto sec = (int64_t)strtoll(p, &endp, 10);
if (endp == p || *endp != '\0' || sec == 0) {
sinceNs = 0;