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

Merge branch 'readonly-p4-donut' into donut

Browse Source
This commit is contained in:
Robert Greenwalt
2009-04-13 18:36:18 -07:00
committed by The Android Open Source Project
parent 06db67b7ae 0e1c45fd8b
commit 7dd171d72e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -491,7 +491,7 @@ public abstract class PhoneBase implements Phone {
return; // no match possible
}
language.toLowerCase();
if (null != country) {
if (null == country) {
country = "";
}
country = country.toUpperCase();
@@ -505,10 +505,11 @@ public abstract class PhoneBase implements Phone {
for(int i = 0; i < N; i++) {
if (locales[i]!=null && locales[i].length() >= 2 &&
locales[i].substring(0,2).equals(language)) {
if (locales[i].length() >= 5 &&
locales[i].substring(3,5).equals(country)) {
bestMatch = locales[i];
break;
if (locales[i].length() >= 5) {
if (locales[i].substring(3,5).equals(country)) {
bestMatch = locales[i];
break;
}
} else if (null == bestMatch) {
bestMatch = locales[i];
}
@@ -517,7 +518,6 @@ 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));