diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-17 17:51:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-09-17 17:51:53 +0000 |
| commit | db0a92a881e5d542528429849528e66ce29f6aa1 (patch) | |
| tree | 7a2760e9313ba508c093c14770adb69a65b8744a /libs | |
| parent | 56da278127d8832ae292da3f76d78bf4a96031a9 (diff) | |
| parent | 0a0bf365553c614a7ca1ab96a1aa71047fc48081 (diff) | |
Merge "Make configs differing only in density siblings"
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/androidfw/include/androidfw/ConfigDescription.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/androidfw/include/androidfw/ConfigDescription.h b/libs/androidfw/include/androidfw/ConfigDescription.h index acf413aeaf91..61d10cd4e55b 100644 --- a/libs/androidfw/include/androidfw/ConfigDescription.h +++ b/libs/androidfw/include/androidfw/ConfigDescription.h @@ -177,9 +177,8 @@ inline ConfigDescription& ConfigDescription::operator=(ConfigDescription&& o) no return *this; } -inline bool ConfigDescription::MatchWithDensity( - const ConfigDescription& o) const { - return match(o) && (density == 0 || density == o.density); +inline bool ConfigDescription::MatchWithDensity(const ConfigDescription& o) const { + return match(o) && (density == 0 || o.density != 0); } inline bool ConfigDescription::operator<(const ConfigDescription& o) const { |