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

Commit 635035e4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix aapt badging segmentation fault" into sc-dev am: 3266b697 

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

Change-Id: Iee9b002d6c6b976ac5069adf1039414ee282bf38
parents eaabbc06 3266b697

tools/aapt/Command.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1121,8 +1121,8 @@ int doDump(Bundle* bundle) 


                // Skip all "uses-sdk" tags besides the very last tag. The android runtime only uses

                // the attribute values from the last defined tag.

                for (size_t i = 0; i < usesSdkTagPositions.size() - 1; i++) {

                    tagsToSkip.emplace_back(usesSdkTagPositions[i]);

                for (size_t i = 1; i < usesSdkTagPositions.size(); i++) {

                    tagsToSkip.emplace_back(usesSdkTagPositions[i - 1]);

                }



                // Reset the position before parsing.