diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/WindowManager/Shell/OWNERS | 1 | ||||
| -rw-r--r-- | libs/WindowManager/Shell/tests/OWNERS | 2 | ||||
| -rw-r--r-- | libs/androidfw/ConfigDescription.cpp | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/libs/WindowManager/Shell/OWNERS b/libs/WindowManager/Shell/OWNERS index 36da7aac9106..e2c67fd8f8d4 100644 --- a/libs/WindowManager/Shell/OWNERS +++ b/libs/WindowManager/Shell/OWNERS @@ -1,5 +1,4 @@ # sysui owners hwwang@google.com -mrenouf@google.com winsonc@google.com madym@google.com diff --git a/libs/WindowManager/Shell/tests/OWNERS b/libs/WindowManager/Shell/tests/OWNERS new file mode 100644 index 000000000000..2c6c7b358e3b --- /dev/null +++ b/libs/WindowManager/Shell/tests/OWNERS @@ -0,0 +1,2 @@ +# includes OWNERS from parent directories +natanieljr@google.com 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); } |