diff options
author | 2020-11-15 23:05:18 +0000 | |
---|---|---|
committer | 2020-11-15 23:05:18 +0000 | |
commit | 0b27d157ddcb67ffaa99fdeb2257b31391d13d55 (patch) | |
tree | 00fbd70f6cf369991ebb32ec467d3fc717260753 /libs/androidfw/ConfigDescription.cpp | |
parent | 162922a2556b41878c625a6f33f6efdbbf43e9f3 (diff) | |
parent | 518d35c01746dc634434bccaf00111da208a4e1c (diff) |
Merge "Fix DominatorTree for locale and mcc/mnc config" am: 8f2f4e14de am: caff40cad3 am: c9acec6545 am: 518d35c017
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481918
Change-Id: I78ffd81962fdfba38c46590e8b6ae76c582ab77b
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
-rw-r--r-- | libs/androidfw/ConfigDescription.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/androidfw/ConfigDescription.cpp b/libs/androidfw/ConfigDescription.cpp index 1f3a89edb8af..19ead9583eb2 100644 --- a/libs/androidfw/ConfigDescription.cpp +++ b/libs/androidfw/ConfigDescription.cpp @@ -887,13 +887,16 @@ bool ConfigDescription::Dominates(const ConfigDescription& o) const { } // Locale de-duping is not-trivial, disable for now (b/62409213). - if (diff(o) & CONFIG_LOCALE) { + // We must also disable de-duping for all configuration qualifiers with precedence higher than + // locale (b/171892595) + if (diff(o) & (CONFIG_LOCALE | CONFIG_MCC | CONFIG_MNC)) { return false; } if (*this == DefaultConfig()) { return true; } + return MatchWithDensity(o) && !o.MatchWithDensity(*this) && !isMoreSpecificThan(o) && !o.HasHigherPrecedenceThan(*this); } |