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

Commit 80429eee authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Migrate from android::String isEmpty to empty" into main

parents 8d32b85c fd9ffd1d

camera/VendorTagDescriptor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ status_t VendorTagDescriptor::readFromParcel(const android::Parcel* parcel) { 
            break;

        }

        String8 tagName = parcel->readString8();

        if (tagName.isEmpty()) {

        if (tagName.empty()) {

            ALOGE("%s: parcel tag name was NULL for tag %d.", __FUNCTION__, tag);

            res = NOT_ENOUGH_DATA;

            break;
@@ -190,7 +190,7 @@ status_t VendorTagDescriptor::readFromParcel(const android::Parcel* parcel) { 
                "Vector capacity must be positive");

        for (size_t i = 0; i < sectionCount; ++i) {

            String8 sectionName = parcel->readString8();

            if (sectionName.isEmpty()) {

            if (sectionName.empty()) {

                ALOGE("%s: parcel section name was NULL for section %zu.",

                      __FUNCTION__, i);

                return NOT_ENOUGH_DATA;

cmds/stagefright/stagefright.cpp

+2 −2
Original line number Diff line number Diff line
@@ -212,8 +212,8 @@ static void playSource(sp<MediaSource> &source) { 
        }

        rawSource = SimpleDecodingSource::Create(

                source, flags, gSurface,

                gComponentNameOverride.isEmpty() ? nullptr : gComponentNameOverride.c_str(),

                !gComponentNameOverride.isEmpty());

                gComponentNameOverride.empty() ? nullptr : gComponentNameOverride.c_str(),

                !gComponentNameOverride.empty());

        if (rawSource == NULL) {

            return;

        }

drm/drmserver/DrmManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ void DrmManager::recordEngineMetrics( 
        }

    }



    if (!mimeType.isEmpty()) {

    if (!mimeType.empty()) {

        metrics.mMimeTypes.insert(mimeType.c_str());

    } else if (NULL != info) {

        DrmSupportInfo::MimeTypeIterator mimeIter = info->getMimeTypeIterator();
@@ -395,7 +395,7 @@ String8 DrmManager::getOriginalMimeType(int uniqueId, const String8& path, int f 
        IDrmEngine& rDrmEngine = mPlugInManager.getPlugIn(plugInId);

        mimeType = rDrmEngine.getOriginalMimeType(uniqueId, path, fd);

    }

    if (!mimeType.isEmpty()) {

    if (!mimeType.empty()) {

        recordEngineMetrics(__func__, plugInId, mimeType);

    }

    return mimeType;

drm/libmediadrm/DrmHalAidl.cpp

+3 −3
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ struct DrmHalAidl::DrmSessionClient : public aidl::android::media::BnResourceMan 
    sp<DrmHalAidl> drm = mDrm.promote();

    if (drm == NULL) {

        name.append("<deleted>");

    } else if (drm->getPropertyStringInternal(String8("vendor"), name) != OK || name.isEmpty()) {

    } else if (drm->getPropertyStringInternal(String8("vendor"), name) != OK || name.empty()) {

        name.append("<Get vendor failed or is empty>");

    }

    name.append("[");
@@ -947,12 +947,12 @@ DrmStatus DrmHalAidl::getMetrics(const sp<IDrmMetricsConsumer>& consumer) { 


    String8 vendor;

    String8 description;

    if (getPropertyStringInternal(String8("vendor"), vendor) != OK || vendor.isEmpty()) {

    if (getPropertyStringInternal(String8("vendor"), vendor) != OK || vendor.empty()) {

        ALOGE("Get vendor failed or is empty");

        vendor = "NONE";

    }

    if (getPropertyStringInternal(String8("description"), description) != OK ||

        description.isEmpty()) {

        description.empty()) {

        ALOGE("Get description failed or is empty.");

        description = "NONE";

    }

drm/libmediadrm/DrmHalHidl.cpp

+3 −3
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ struct DrmHalHidl::DrmSessionClient : public aidl::android::media::BnResourceMan 
    sp<DrmHalHidl> drm = mDrm.promote();

    if (drm == NULL) {

        name.append("<deleted>");

    } else if (drm->getPropertyStringInternal(String8("vendor"), name) != OK || name.isEmpty()) {

    } else if (drm->getPropertyStringInternal(String8("vendor"), name) != OK || name.empty()) {

        name.append("<Get vendor failed or is empty>");

    }

    name.append("[");
@@ -1261,12 +1261,12 @@ DrmStatus DrmHalHidl::getMetrics(const sp<IDrmMetricsConsumer>& consumer) { 
    if (mPluginV1_1 != NULL) {

        String8 vendor;

        String8 description;

        if (getPropertyStringInternal(String8("vendor"), vendor) != OK || vendor.isEmpty()) {

        if (getPropertyStringInternal(String8("vendor"), vendor) != OK || vendor.empty()) {

            ALOGE("Get vendor failed or is empty");

            vendor = "NONE";

        }

        if (getPropertyStringInternal(String8("description"), description) != OK ||

            description.isEmpty()) {

            description.empty()) {

            ALOGE("Get description failed or is empty.");

            description = "NONE";

        }