Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 729a901: Merge change 1099 into donut

Browse Source 
Merge commit '729a901b2a9ca163d6395983711cea1fdc7b5eb5'

* commit '729a901b2a9ca163d6395983711cea1fdc7b5eb5':
  Fix Phone-based locale selection to never choose a lang-only locale.
This commit is contained in:
Android (Google) Code Review
2009-05-06 15:49:01 -07:00
committed by The Android Open Source Project
parent 6ea036760f 729a901b2a
commit 93ec975eda
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
telephony/java/com/android/internal/telephony/PhoneBase.java
View File

@@ -490,7 +490,7 @@ public abstract class PhoneBase implements Phone {
if (null == language) {
return; // no match possible
}
language.toLowerCase();
language = language.toLowerCase();
if (null == country) {
country = "";
}
@@ -503,13 +503,12 @@ public abstract class PhoneBase implements Phone {
final int N = locales.length;
String bestMatch = null;
for(int i = 0; i < N; i++) {
if (locales[i]!=null && locales[i].length() >= 2 &&
// only match full (lang + country) locales
if (locales[i]!=null && locales[i].length() >= 5 &&
locales[i].substring(0,2).equals(language)) {
if (locales[i].length() >= 5) {
if (locales[i].substring(3,5).equals(country)) {
bestMatch = locales[i];
break;
}
if (locales[i].substring(3,5).equals(country)) {
bestMatch = locales[i];
break;
} else if (null == bestMatch) {
bestMatch = locales[i];
}
@@ -518,12 +517,8 @@ public abstract class PhoneBase implements Phone {
if (null != bestMatch) {
IActivityManager am = ActivityManagerNative.getDefault();
Configuration config = am.getConfiguration();
if (bestMatch.length() >= 5) {
config.locale = new Locale(bestMatch.substring(0,2),
bestMatch.substring(3,5));
} else {
config.locale = new Locale(bestMatch.substring(0,2));
}
config.locale = new Locale(bestMatch.substring(0,2),
bestMatch.substring(3,5));
config.userSetLocale = true;
am.updateConfiguration(config);
}