Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53ce3afe authored Aug 14, 2023 by Tomasz Wasilczyk

Don't use String8::empty

With the current definition, it's an alias of default constructor. This
has very different meaning from std::string empty, especially that
static method String8::empty can still be called from instance context.

One of such bugs are present in in ConversionHelperAidl.

Bug: 295394788
Test: make checkbuild
Change-Id: Ic466986bdf850a44c30c919450fd8b92ac68758d

parent de76fc18

media/libaudioclient/AudioTrack.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3448,7 +3448,7 @@ String8 AudioTrack::getParameters(const String8& keys)
	if (output != AUDIO_IO_HANDLE_NONE) {		if (output != AUDIO_IO_HANDLE_NONE) {
	return AudioSystem::getParameters(output, keys);		return AudioSystem::getParameters(output, keys);
	} else {		} else {
	return String8::empty();		return String8();
	}		}
	}		}

media/libaudiohal/impl/ConversionHelperAidl.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -69,7 +69,7 @@ status_t parseAndGetVendorParameters(
	// Re-parse the vendor-provided string to ensure that it is correct.		// Re-parse the vendor-provided string to ensure that it is correct.
	AudioParameter reparse(String8(vendorParameters.c_str()));		AudioParameter reparse(String8(vendorParameters.c_str()));
	if (reparse.size() != 0) {		if (reparse.size() != 0) {
	if (!values->empty()) {		if (values->length() > 0) {
	values->append(";");		values->append(";");
	}		}
	values->append(reparse.toString().c_str());		values->append(reparse.toString().c_str());

media/libdatasource/MediaHTTP.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -156,7 +156,7 @@ status_t MediaHTTP::reconnectAtOffset(off64_t offset) {

	String8 MediaHTTP::getUri() {		String8 MediaHTTP::getUri() {
	if (mInitCheck != OK) {		if (mInitCheck != OK) {
	return String8::empty();		return String8();
	}		}

	String8 uri;		String8 uri;

media/libmedia/IMediaExtractor.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -339,7 +339,7 @@ void registerMediaSource(
	if (source != NULL) {		if (source != NULL) {
	instance.trackDescriptions.push_front(source->getFormat()->toString());		instance.trackDescriptions.push_front(source->getFormat()->toString());
	} else {		} else {
	instance.trackDescriptions.push_front(String8::empty());		instance.trackDescriptions.push_front(String8());
	}		}
	break;		break;
	}		}

media/libmediaplayerservice/MediaPlayerService.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2007,7 +2007,7 @@ status_t MediaPlayerService::AudioOutput::setParameters(const String8& keyValueP
	String8 MediaPlayerService::AudioOutput::getParameters(const String8& keys)		String8 MediaPlayerService::AudioOutput::getParameters(const String8& keys)
	{		{
	Mutex::Autolock lock(mLock);		Mutex::Autolock lock(mLock);
	if (mTrack == 0) return String8::empty();		if (mTrack == 0) return String8();
	return mTrack->getParameters(keys);		return mTrack->getParameters(keys);
	}		}