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

Commit aa00ae0a authored by Bryan Mawhinney's avatar Bryan Mawhinney Committed by Android Git Automerger
Browse files

am 99017c01: Merge "Fix issue preventing aapt from stripping all unwanted... 

am 99017c01: Merge "Fix issue preventing aapt from stripping all unwanted densities" into lmp-preview-dev

* commit '99017c01bac525ca4b5b10768052ced398b4a493':
  Fix issue preventing aapt from stripping all unwanted densities
parents 75814c19 2386bd5d

tools/aapt/AaptAssets.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1457,9 +1457,9 @@ status_t AaptAssets::filter(Bundle* bundle) 
                        if (AaptConfig::isSameExcept(config, mconfig, ResTable_config::CONFIG_DENSITY)) {

                            // See if there is a better density resource

                            if (mconfig.density < bestDensity &&

                                    mconfig.density > preferredDensity &&

                                    mconfig.density >= preferredDensity &&

                                    bestDensity > preferredDensity) {

                                // This density is between our best density and

                                // This density is our preferred density, or between our best density and

                                // the preferred density, therefore it is better.

                                bestDensity = mconfig.density;

                            } else if (mconfig.density > bestDensity &&