wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1102604 - SysInfo.getLocale() is wrong. r=mcomella

Browse Source
This commit is contained in:
Richard Newman 2014-12-23 14:28:46 -08:00
parent 7ad5c4ecc5
commit 555668cf46
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mobile/android/base/ANRReporter.java
View File

@ -15,6 +15,7 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.Reader;
import java.util.Locale;
import java.util.UUID;
import java.util.regex.Pattern;
@ -320,7 +321,7 @@ public final class ANRReporter extends BroadcastReceiver
"\"appUpdateChannel\":" + JSONObject.quote(AppConstants.MOZ_UPDATE_CHANNEL) + "," +
// Technically the platform build ID may be different, but we'll never know
"\"platformBuildID\":" + JSONObject.quote(AppConstants.MOZ_APP_BUILDID) + "," +
"\"locale\":" + JSONObject.quote(SysInfo.getLocale()) + "," +
"\"locale\":" + JSONObject.quote(Locales.getLanguageTag(Locale.getDefault())) + "," +
"\"cpucount\":" + String.valueOf(SysInfo.getCPUCount()) + "," +
"\"memsize\":" + String.valueOf(SysInfo.getMemSize()) + "," +
"\"arch\":" + JSONObject.quote(SysInfo.getArchABI()) + "," +

7
mobile/android/base/SysInfo.java.in
View File

@ -240,11 +240,4 @@ public final class SysInfo {
// differ to add value.
return android.os.Build.CPU_ABI;
}
/**
* @return the default system locale, such as "en-US"
*/
public static String getLocale() {
return java.util.Locale.getDefault().toString().replace('_', '-');
}
}