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

Commit 017880c7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't use String8::empty" into main am: 5b401d3b am: 280d7677 am:... 

Merge "Don't use String8::empty" into main am: 5b401d3b am: 280d7677 am: f70ed8f5 am: 89dc5783

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2707674



Change-Id: I14657864922d62414cef66c368b79ce64ae8928d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d2ff9e16 89dc5783

media/libaudioclient/AudioTrack.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3478,7 +3478,7 @@ String8 AudioTrack::getParameters(const String8& keys) 
    if (output != AUDIO_IO_HANDLE_NONE) {

        return AudioSystem::getParameters(output, keys);

    } else {

        return String8::empty();

        return String8();

    }

}

media/libaudiohal/impl/ConversionHelperAidl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ status_t parseAndGetVendorParameters( 
        // Re-parse the vendor-provided string to ensure that it is correct.

        AudioParameter reparse(String8(vendorParameters.c_str()));

        if (reparse.size() != 0) {

            if (!values->empty()) {

            if (values->length() > 0) {

                values->append(";");

            }

            values->append(reparse.toString().c_str());

media/libdatasource/MediaHTTP.cpp

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


String8 MediaHTTP::getUri() {

    if (mInitCheck != OK) {

        return String8::empty();

        return String8();

    }



    String8 uri;

media/libmedia/IMediaExtractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ void registerMediaSource( 
            if (source != NULL) {

                instance.trackDescriptions.push_front(source->getFormat()->toString());

            } else {

                instance.trackDescriptions.push_front(String8::empty());

                instance.trackDescriptions.push_front(String8());

            }

            break;

        }

media/libmediaplayerservice/MediaPlayerService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2008,7 +2008,7 @@ status_t MediaPlayerService::AudioOutput::setParameters(const String8& keyValueP 
String8  MediaPlayerService::AudioOutput::getParameters(const String8& keys)

{

    Mutex::Autolock lock(mLock);

    if (mTrack == 0) return String8::empty();

    if (mTrack == 0) return String8();

    return mTrack->getParameters(keys);

}