diff options
| author | Bryan Mawhinney <bryanmawhinney@google.com> | 2014-06-06 13:27:11 +0100 |
|---|---|---|
| committer | Bryan Mawhinney <bryanmawhinney@google.com> | 2014-06-06 13:27:11 +0100 |
| commit | b0db8de73e6e4151b4e9d1fe3be1f609c3c1fb83 (patch) | |
| tree | 66658848aac4c3a8d3cd5de4be43ac73d1dbc24e /tools | |
| parent | adf2ea2bfda0bde4ef84725402d6b033dfa2b9f1 (diff) | |
| download | frameworks_base-b0db8de73e6e4151b4e9d1fe3be1f609c3c1fb83.zip frameworks_base-b0db8de73e6e4151b4e9d1fe3be1f609c3c1fb83.tar.gz frameworks_base-b0db8de73e6e4151b4e9d1fe3be1f609c3c1fb83.tar.bz2 | |
Fix issue preventing aapt from stripping all unwanted densities
Bug: 15463874
Change-Id: I9d1e289f1db2ed3c9a41d91caea6d07b69fcb84f
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index 12d5389..2028ff4 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -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 && |