diff options
Diffstat (limited to 'telephony/java/com')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/PhoneBase.java | 12 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/MccTable.java | 9 |
2 files changed, 10 insertions, 11 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)); diff --git a/telephony/java/com/android/internal/telephony/gsm/MccTable.java b/telephony/java/com/android/internal/telephony/gsm/MccTable.java index 8473a21..a30b188 100644 --- a/telephony/java/com/android/internal/telephony/gsm/MccTable.java +++ b/telephony/java/com/android/internal/telephony/gsm/MccTable.java @@ -182,7 +182,7 @@ public final class MccTable table.add(new MccEntry(222,"it",2,"Europe/Rome","it")); //Italy table.add(new MccEntry(225,"va",2,"Europe/Rome","it")); //Vatican City State table.add(new MccEntry(226,"ro",2)); //Romania - table.add(new MccEntry(228,"ch",2)); //Switzerland (Confederation of) + table.add(new MccEntry(228,"ch",2,"Europe/Zurich","en")); //Switzerland (Confederation of) table.add(new MccEntry(230,"cz",2,"Europe/Prague")); //Czech Republic table.add(new MccEntry(231,"sk",2)); //Slovak Republic table.add(new MccEntry(232,"at",2,"Europe/Vienna","de")); //Austria @@ -204,7 +204,7 @@ public final class MccTable table.add(new MccEntry(266,"gi",2)); //Gibraltar table.add(new MccEntry(268,"pt",2)); //Portugal table.add(new MccEntry(270,"lu",2)); //Luxembourg - table.add(new MccEntry(272,"ie",2)); //Ireland + table.add(new MccEntry(272,"ie",2,"Europe/Belfast","en")); //Ireland table.add(new MccEntry(274,"is",2)); //Iceland table.add(new MccEntry(276,"al",2)); //Albania (Republic of) table.add(new MccEntry(278,"mt",2)); //Malta @@ -305,7 +305,7 @@ public final class MccTable table.add(new MccEntry(520,"th",2)); //Thailand table.add(new MccEntry(525,"sg",2,"Singapore","en")); //Singapore (Republic of) table.add(new MccEntry(528,"bn",2)); //Brunei Darussalam - table.add(new MccEntry(530,"nz",2)); //New Zealand + table.add(new MccEntry(530,"nz",2,"Pacific/Auckland", "en")); //New Zealand table.add(new MccEntry(534,"mp",2)); //Northern Mariana Islands (Commonwealth of the) table.add(new MccEntry(535,"gu",2)); //Guam table.add(new MccEntry(536,"nr",2)); //Nauru (Republic of) @@ -376,7 +376,7 @@ public final class MccTable table.add(new MccEntry(652,"bw",2)); //Botswana (Republic of) table.add(new MccEntry(653,"sz",2)); //Swaziland (Kingdom of) table.add(new MccEntry(654,"km",2)); //Comoros (Union of the) - table.add(new MccEntry(655,"za",2)); //South Africa (Republic of) + table.add(new MccEntry(655,"za",2,"Africa/Johannesburg","en")); //South Africa (Republic of) table.add(new MccEntry(657,"er",2)); //Eritrea table.add(new MccEntry(702,"bz",2)); //Belize table.add(new MccEntry(704,"gt",2)); //Guatemala (Republic of) @@ -404,4 +404,3 @@ public final class MccTable Collections.sort(table); } } - |