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

[Wi-Fi] Remove WifiTrackerLib/AccessPoint constant & API usage

Browse Source 
Bug: 152571756
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi
      make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.dpp
      make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.details
Change-Id: I857cf0e261c1b07c3d7b6bc08632880ed8c71ee1
This commit is contained in:
Arc Wang
2020-06-22 17:32:52 +08:00
parent fef7216ef9
commit 166ece8f1d
9 changed files with 36 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -70,7 +70,6 @@ import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
import com.android.settings.wifi.dpp.WifiDppUtils;
import com.android.settingslib.Utils;
import com.android.settingslib.utils.ThreadUtils;
import com.android.settingslib.wifi.AccessPoint;
import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiEntry.ConnectedInfo;
@@ -363,19 +362,6 @@ public class WifiConfigController2 implements TextWatcher,
&& signalLevel != null) {
mConfigUi.setSubmitButton(res.getString(R.string.wifi_connect));
} else {
// TODO(b/143326832): Add fine-grained state information.
//WifiConfiguration config = mWifiEntry.getWifiConfiguration();
//String suggestionOrSpecifierPackageName = null;
//if (config != null
// && (config.fromWifiNetworkSpecifier
// || config.fromWifiNetworkSuggestion)) {
// suggestionOrSpecifierPackageName = config.creatorName;
//}
//String summary = AccessPoint.getSummary(
// mConfigUi.getContext(), /* ssid */ null, state, isEphemeral,
// suggestionOrSpecifierPackageName);
//addRow(group, R.string.wifi_status, summary);
if (signalLevel != null) {
addRow(group, R.string.wifi_signal, signalLevel);
}
@@ -390,11 +376,11 @@ public class WifiConfigController2 implements TextWatcher,
final int frequency = info.frequencyMhz;
String band = null;
if (frequency >= WifiEntryShell.LOWER_FREQ_24GHZ
&& frequency < WifiEntryShell.HIGHER_FREQ_24GHZ) {
if (frequency >= WifiEntry.MIN_FREQ_24GHZ
&& frequency < WifiEntry.MAX_FREQ_24GHZ) {
band = res.getString(R.string.wifi_band_24ghz);
} else if (frequency >= WifiEntryShell.LOWER_FREQ_5GHZ
&& frequency < WifiEntryShell.HIGHER_FREQ_5GHZ) {
} else if (frequency >= WifiEntry.MIN_FREQ_5GHZ
&& frequency < WifiEntry.MAX_FREQ_5GHZ) {
band = res.getString(R.string.wifi_band_5ghz);
} else {
Log.e(TAG, "Unexpected frequency " + frequency);
@@ -598,13 +584,11 @@ public class WifiConfigController2 implements TextWatcher,
WifiConfiguration config = new WifiConfiguration();
if (mWifiEntry == null) {
config.SSID = AccessPoint.convertToQuotedString(
mSsidView.getText().toString());
config.SSID = "\"" + mSsidView.getText().toString() + "\"";
// If the user adds a network manually, assume that it is hidden.
config.hiddenSSID = mHiddenSettingsSpinner.getSelectedItemPosition() == HIDDEN_NETWORK;
} else if (!mWifiEntry.isSaved()) {
config.SSID = AccessPoint.convertToQuotedString(
mWifiEntry.getTitle());
config.SSID = "\"" + mWifiEntry.getTitle() + "\"";
} else {
config.networkId = mWifiEntry.getWifiConfiguration().networkId;
config.hiddenSSID = mWifiEntry.getWifiConfiguration().hiddenSSID;