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

Commit a73daaeb authored by Ryan Mitchell's avatar Ryan Mitchell Committed by Automerger Merge Worker
Browse files

Merge "Do not call pop_back when app has no uses-sdk" into sc-dev am: 47e58f12 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664167

Change-Id: I05aad42f7077ee8f285e8df581608e872731834c
parents 29cccc0b 47e58f12

tools/aapt2/dump/DumpManifest.cpp

+7 −6
Original line number Diff line number Diff line
@@ -1978,12 +1978,13 @@ bool ManifestExtractor::Dump(text::Printer* printer, IDiagnostics* diag) { 
      filtered_uses_sdk_tags.emplace_back(uses_sdk);

    }

  }

  if (filtered_uses_sdk_tags.size() >= 2U) {

    filtered_uses_sdk_tags.pop_back();



    root->Filter([&](const ManifestExtractor::Element* e) {

      return std::find(filtered_uses_sdk_tags.begin(), filtered_uses_sdk_tags.end(), e) !=

             filtered_uses_sdk_tags.end();

    });

  }



  // Print the elements in order seen

  Print(root.get(), printer);