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

Commit cf48bbe4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[conflict] Merge "Migrate from android::String isEmpty to empty [aapt]"... 

Merge "[conflict] Merge "Migrate from android::String isEmpty to empty [aapt]" into main am: 2ce95923 am: e5ee5111" into udc-dev-plus-aosp
parents 26447f1b cbb5520b

libs/androidfw/AssetManager2.cpp

+2 −2
Original line number Diff line number Diff line
@@ -958,13 +958,13 @@ std::string AssetManager2::GetLastResourceResolution() const { 
    const auto& assets = GetApkAssets(step.cookie);

    log_stream << "\n\t" << prefix->second << ": " 

               << (assets ? assets->GetDebugName() : "<null>") << " #" << step.cookie;

    if (!step.config_name.isEmpty()) {

    if (!step.config_name.empty()) {

      log_stream << " - " << step.config_name;

    }

  }



  log_stream << "\nBest matching is from "

             << (last_resolution_.best_config_name.isEmpty() ? "default"

             << (last_resolution_.best_config_name.empty() ? "default"

                                                   : last_resolution_.best_config_name)

             << " configuration of " << last_resolution_.best_package_name;

  return log_stream.str();

tools/aapt/AaptAssets.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1540,7 +1540,7 @@ status_t AaptAssets::buildIncludedResources(Bundle* bundle) 
    }



    const String8& featureOfBase = bundle->getFeatureOfPackage();

    if (!featureOfBase.isEmpty()) {

    if (!featureOfBase.empty()) {

        if (bundle->getVerbose()) {

            printf("Including base feature resources from package: %s\n",

                    featureOfBase.c_str());

tools/aapt/Command.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1133,7 +1133,7 @@ int doDump(Bundle* bundle) 
                if (code == ResXMLTree::END_TAG) {

                    depth--;

                    if (depth < 2) {

                        if (withinSupportsInput && !supportedInput.isEmpty()) {

                        if (withinSupportsInput && !supportedInput.empty()) {

                            printf("supports-input: '");

                            const size_t N = supportedInput.size();

                            for (size_t i=0; i<N; i++) {
@@ -1300,7 +1300,7 @@ int doDump(Bundle* bundle) 
                            ResTable::normalizeForOutput(versionName.c_str()).c_str());



                    String8 splitName = AaptXml::getAttribute(tree, NULL, "split");

                    if (!splitName.isEmpty()) {

                    if (!splitName.empty()) {

                        printf(" split='%s'", ResTable::normalizeForOutput(

                                    splitName.c_str()).c_str());

                    }

tools/aapt/Resource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1285,7 +1285,7 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets, sp<ApkBuil 
        packageType = ResourceTable::SharedLibrary;

    } else if (bundle->getExtending()) {

        packageType = ResourceTable::System;

    } else if (!bundle->getFeatureOfPackage().isEmpty()) {

    } else if (!bundle->getFeatureOfPackage().empty()) {

        packageType = ResourceTable::AppFeature;

    }
@@ -3144,7 +3144,7 @@ writeProguardForXml(ProguardKeepSet* keep, const sp<AaptFile>& layoutFile, 


    tree.restart();



    if (!startTags.isEmpty()) {

    if (!startTags.empty()) {

        bool haveStart = false;

        while ((code=tree.next()) != ResXMLTree::END_DOCUMENT && code != ResXMLTree::BAD_DOCUMENT) {

            if (code != ResXMLTree::START_TAG) {

tools/aapt/ResourceTable.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1813,7 +1813,7 @@ status_t ResourceTable::addIncludedResources(Bundle* bundle, const sp<AaptAssets 
    mTypeIdOffset = findLargestTypeIdForPackage(assets->getIncludedResources(), mAssetsPackage);



    const String8& featureAfter = bundle->getFeatureAfterPackage();

    if (!featureAfter.isEmpty()) {

    if (!featureAfter.empty()) {

        AssetManager featureAssetManager;

        if (!featureAssetManager.addAssetPath(featureAfter, NULL)) {

            fprintf(stderr, "ERROR: Feature package '%s' not found.\n",
@@ -3252,7 +3252,7 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>& 


            // If we're building splits, then each invocation of the flattening

            // step will have 'missing' entries. Don't warn/error for this case.

            if (bundle->getSplitConfigurations().isEmpty()) {

            if (bundle->getSplitConfigurations().empty()) {

                bool missing_entry = false;

                const char* log_prefix = bundle->getErrorOnMissingConfigEntry() ?

                        "error" : "warning";
@@ -4858,7 +4858,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle, 


    Vector<sp<XMLNode> > nodesToVisit;

    nodesToVisit.push(root);

    while (!nodesToVisit.isEmpty()) {

    while (!nodesToVisit.empty()) {

        sp<XMLNode> node = nodesToVisit.top();

        nodesToVisit.pop();