diff options
| -rw-r--r-- | telephony/java/com/android/internal/telephony/PhoneBase.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/telephony/java/com/android/internal/telephony/PhoneBase.java b/telephony/java/com/android/internal/telephony/PhoneBase.java index 259de62..20c54fb 100644 --- a/telephony/java/com/android/internal/telephony/PhoneBase.java +++ b/telephony/java/com/android/internal/telephony/PhoneBase.java @@ -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)); |