PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove band preference in WiFi settings.

Browse Source 
Bug: b/25743379

Change-Id: Iddea166e0e0925fffb70de80978501945e8999a7
This commit is contained in:
pkanwar
2016-03-10 18:12:17 -08:00
parent dccc582d26
commit fae7e6cd97
4 changed files with 1 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/android/settings/wifi/ConfigureWifiSettings.java
View File

@@ -49,7 +49,6 @@ public class ConfigureWifiSettings extends SettingsPreferenceFragment
private static final String KEY_MAC_ADDRESS = "mac_address";
private static final String KEY_SAVED_NETWORKS = "saved_networks";
private static final String KEY_CURRENT_IP_ADDRESS = "current_ip_address";
private static final String KEY_FREQUENCY_BAND = "frequency_band";
private static final String KEY_NOTIFY_OPEN_NETWORKS = "notify_open_networks";
private static final String KEY_SLEEP_POLICY = "sleep_policy";
private static final String KEY_WIFI_ASSISTANT = "wifi_assistant";
@@ -114,24 +113,6 @@ public class ConfigureWifiSettings extends SettingsPreferenceFragment
getPreferenceScreen().removePreference(mWifiAssistantPreference);
}
ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);
if (mWifiManager.isDualBandSupported()) {
frequencyPref.setOnPreferenceChangeListener(this);
int value = mWifiManager.getFrequencyBand();
if (value != -1) {
frequencyPref.setValue(String.valueOf(value));
updateFrequencyBandSummary(frequencyPref, value);
} else {
Log.e(TAG, "Failed to fetch frequency band");
}
} else {
if (frequencyPref != null) {
// null if it has already been removed before resume
getPreferenceScreen().removePreference(frequencyPref);
}
}
ListPreference sleepPolicyPref = (ListPreference) findPreference(KEY_SLEEP_POLICY);
if (sleepPolicyPref != null) {
if (Utils.isWifiOnly(context)) {
@@ -186,17 +167,7 @@ public class ConfigureWifiSettings extends SettingsPreferenceFragment
final Context context = getActivity();
String key = preference.getKey();
if (KEY_FREQUENCY_BAND.equals(key)) {
try {
int value = Integer.parseInt((String) newValue);
mWifiManager.setFrequencyBand(value, true);
updateFrequencyBandSummary(preference, value);
} catch (NumberFormatException e) {
Toast.makeText(context, R.string.wifi_setting_frequency_band_error,
Toast.LENGTH_SHORT).show();
return false;
}
} else if (KEY_WIFI_ASSISTANT.equals(key)) {
if (KEY_WIFI_ASSISTANT.equals(key)) {
NetworkScorerAppManager.NetworkScorerAppData wifiAssistant =
NetworkScorerAppManager.getScorer(context, (String) newValue);
if (wifiAssistant == null) {