diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-01-23 02:36:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-23 02:36:39 +0000 |
| commit | 83f58a2f7afac98199536b3090fe6f767ffb3a0d (patch) | |
| tree | 67995d71e46bb2b9d422606a2f6440fafb1bcaa6 | |
| parent | 0ec0465542ba41634ed13dd6bae2eca6afa62d4a (diff) | |
| parent | b443610bcb9a1f0d8e64b55c7d6e53bc54d7ec43 (diff) | |
| download | frameworks_base-83f58a2f7afac98199536b3090fe6f767ffb3a0d.zip frameworks_base-83f58a2f7afac98199536b3090fe6f767ffb3a0d.tar.gz frameworks_base-83f58a2f7afac98199536b3090fe6f767ffb3a0d.tar.bz2 | |
Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev
automerge: b443610
* commit 'b443610bcb9a1f0d8e64b55c7d6e53bc54d7ec43':
AAPT: Use the right enum when checking for density configurations
| -rw-r--r-- | tools/aapt/AaptConfig.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/AaptConfig.cpp b/tools/aapt/AaptConfig.cpp index e88c27a..ede9e99 100644 --- a/tools/aapt/AaptConfig.cpp +++ b/tools/aapt/AaptConfig.cpp @@ -796,7 +796,7 @@ bool isSameExcept(const ResTable_config& a, const ResTable_config& b, int axisMa } bool isDensityOnly(const ResTable_config& config) { - if (config.density == ResTable_config::DENSITY_NONE) { + if (config.density == ResTable_config::DENSITY_DEFAULT) { return false; } |