summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-02-23 11:18:42 -0500
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 12:54:01 +0200
commit8b539ec9e76c3daf39f1d7ac188aee3778474ee8 (patch)
treebba4ebd4f3a497aed95e616aa0b119d0fc70f666
parentba0011606d53b1f3fd00625b68aa3aa6e6f55332 (diff)
downloadUXP-8b539ec9e76c3daf39f1d7ac188aee3778474ee8.tar
UXP-8b539ec9e76c3daf39f1d7ac188aee3778474ee8.tar.gz
UXP-8b539ec9e76c3daf39f1d7ac188aee3778474ee8.tar.lz
UXP-8b539ec9e76c3daf39f1d7ac188aee3778474ee8.tar.xz
UXP-8b539ec9e76c3daf39f1d7ac188aee3778474ee8.zip
Issue #1053 - Remove android support from intl/locale/nsLocaleService.cpp
This is the only non-icu file with android code in it. Not going to remove android in icu its self because it remains a 3rd party lib.
-rw-r--r--intl/locale/nsLocaleService.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/intl/locale/nsLocaleService.cpp b/intl/locale/nsLocaleService.cpp
index 6d45ec9af..d81fb50c2 100644
--- a/intl/locale/nsLocaleService.cpp
+++ b/intl/locale/nsLocaleService.cpp
@@ -134,11 +134,6 @@ nsLocaleService::nsLocaleService(void)
bool lc_temp_valid = lc_temp != nullptr;
-#if defined(MOZ_WIDGET_ANDROID)
- // Treat the "C" env as nothing useful. See Bug 1095298.
- lc_temp_valid = lc_temp_valid && strcmp(lc_temp, "C") != 0;
-#endif
-
if (lc_temp_valid) {
result = nsPosixLocale::GetXPLocale(lc_temp, xpLocale);
CopyASCIItoUTF16(lc_temp, platformLocale);