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

am feafc202: am fe225e25: Merge change I70e1f7a6 into eclair

Browse Source 
Merge commit 'feafc202bbfd768423326aeb0faafaee3f348bb6' into eclair-mr2-plus-aosp

* commit 'feafc202bbfd768423326aeb0faafaee3f348bb6':
  Fix the selection of locale from SIM mcc.
This commit is contained in:
Robert Greenwalt
2009-11-09 16:25:04 -08:00
committed by Android Git Automerger
parent c6aaa09b70 feafc202bb
commit 69da1fe8b8
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -572,7 +572,6 @@ public final class MccTable
* @param mccmnc truncated imsi with just the MCC and MNC - MNC assumed to be from 4th to end * @param mccmnc truncated imsi with just the MCC and MNC - MNC assumed to be from 4th to end
*/ */
public static void updateMccMncConfiguration(PhoneBase phone, String mccmnc) { public static void updateMccMncConfiguration(PhoneBase phone, String mccmnc) {
Configuration config = new Configuration();
int mcc, mnc; int mcc, mnc;
try { try {
@@ -586,15 +585,18 @@ public final class MccTable
Log.d(LOG_TAG, "updateMccMncConfiguration: mcc=" + mcc + ", mnc=" + mnc); Log.d(LOG_TAG, "updateMccMncConfiguration: mcc=" + mcc + ", mnc=" + mnc);
if (mcc != 0) { if (mcc != 0) {
config.mcc = mcc;
setTimezoneFromMccIfNeeded(phone, mcc); setTimezoneFromMccIfNeeded(phone, mcc);
setLocaleFromMccIfNeeded(phone, mcc); setLocaleFromMccIfNeeded(phone, mcc);
setWifiChannelsFromMccIfNeeded(phone, mcc); setWifiChannelsFromMccIfNeeded(phone, mcc);
} }
if (mnc != 0) {
config.mnc = mnc;
}
try { try {
Configuration config = ActivityManagerNative.getDefault().getConfiguration();
if (mcc != 0) {
config.mcc = mcc;
}
if (mnc != 0) {
config.mnc = mnc;
}
ActivityManagerNative.getDefault().updateConfiguration(config); ActivityManagerNative.getDefault().updateConfiguration(config);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(LOG_TAG, "Can't update configuration", e); Log.e(LOG_TAG, "Can't update configuration", e);