Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34723087 authored by xunchang's avatar xunchang
Browse files

matches_locale no longer accept empty locales in the png file 

The legacy png files have an empty line in the end. And the recovery
used to match any missing locale, e.g. "he" with that line and gets an
empty image.

Since the empty image is barely useful, we should just error out and
fall back to the default locale.

This reversed the unit test check added in d17a6885

Bug: 128934634
Test: run locale test with "he" and legacy images, recovery reports
error and doesn't crash even without default locale fall back

Change-Id: Ibdb7dd0b42348de5e392c834cce67ff02be85c24
parent 9d05c8a3

minui/resources.cpp

+4 −0
Original line number Diff line number Diff line
@@ -347,6 +347,10 @@ bool matches_locale(const std::string& prefix, const std::string& locale) { 
  // match the locale string without the {script} section.

  // For instance, prefix == "en" matches locale == "en-US", prefix == "sr-Latn" matches locale

  // == "sr-Latn-BA", and prefix == "zh-CN" matches locale == "zh-Hans-CN".

  if (prefix.empty()) {

    return false;

  }



  if (android::base::StartsWith(locale, prefix)) {

    return true;

  }

tests/unit/locale_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ TEST(LocaleTest, Misc) { 
  EXPECT_FALSE(matches_locale("en-GB", "en"));

  EXPECT_FALSE(matches_locale("en-GB", "en-US"));

  EXPECT_FALSE(matches_locale("en-US", ""));

  // Empty locale prefix in the PNG file will match the input locale.

  EXPECT_TRUE(matches_locale("", "en-US"));

  // Empty locale prefix in the PNG file should not match the input locale.

  EXPECT_FALSE(matches_locale("", "en-US"));

  EXPECT_TRUE(matches_locale("sr-Latn", "sr-Latn-BA"));

}