diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-01-23 02:46:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-23 02:46:32 +0000 |
| commit | e03f2cb2c26d30c277d38566976bb4b00326d465 (patch) | |
| tree | 35b907f7852b78fa045c6f97aa56520bf3dc1858 /tools | |
| parent | 92baed1212dffcae042a33f5575f99d3e00f81c8 (diff) | |
| parent | 83f58a2f7afac98199536b3090fe6f767ffb3a0d (diff) | |
| download | frameworks_base-e03f2cb2c26d30c277d38566976bb4b00326d465.zip frameworks_base-e03f2cb2c26d30c277d38566976bb4b00326d465.tar.gz frameworks_base-e03f2cb2c26d30c277d38566976bb4b00326d465.tar.bz2 | |
Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev automerge: b443610
automerge: 83f58a2
* commit '83f58a2f7afac98199536b3090fe6f767ffb3a0d':
AAPT: Use the right enum when checking for density configurations
Diffstat (limited to 'tools')
| -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; } |