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

resolved conflicts for merge of d0514347 to master

Browse Source
This commit is contained in:
Irfan Sheriff
2010-01-25 19:10:31 -08:00
parent 199566045d d051434773
commit c30ffda0d8
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -590,7 +590,7 @@ public final class MccTable
if (mcc != 0) {
setTimezoneFromMccIfNeeded(phone, mcc);
setLocaleFromMccIfNeeded(phone, mcc);
setWifiChannelsFromMccIfNeeded(phone, mcc);
setWifiChannelsFromMcc(phone, mcc);
}
try {
Configuration config = ActivityManagerNative.getDefault().getConfiguration();
@@ -646,20 +646,14 @@ public final class MccTable
* @param phone PhoneBase to act on (get context from).
* @param mcc Mobile Country Code of the SIM or SIM-like entity (build prop on CDMA)
*/
private static void setWifiChannelsFromMccIfNeeded(PhoneBase phone, int mcc) {
private static void setWifiChannelsFromMcc(PhoneBase phone, int mcc) {
int wifiChannels = MccTable.wifiChannelsForMcc(mcc);
if (wifiChannels != 0) {
Context context = phone.getContext();
// only set to this default if the user hasn't manually set it
try {
Settings.Secure.getInt(context.getContentResolver(),
Settings.Secure.WIFI_NUM_ALLOWED_CHANNELS);
} catch (Settings.SettingNotFoundException e) {
Log.d(LOG_TAG, "WIFI_NUM_ALLOWED_CHANNESL set to " + wifiChannels);
WifiManager wM = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
// don't persist
wM.setNumAllowedChannels(wifiChannels, false);
}
Log.d(LOG_TAG, "WIFI_NUM_ALLOWED_CHANNELS set to " + wifiChannels);
WifiManager wM = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
//persist
wM.setNumAllowedChannels(wifiChannels, true);
}
}
}