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

Use WifiEntry.getStandardString() for Wi-Fi Type summary

Browse Source 
Bug: 222337006
Test: manually verify NetworkDetails page shows Wi-Fi Type
Change-Id: I4576fe083f87f631c5f98c526422544055a9df20
This commit is contained in:
Quang Luong
2022-03-29 14:28:22 -07:00
parent 14ffe2a2ef
commit 29bc66a352
3 changed files with 7 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
View File

@@ -42,7 +42,6 @@ import android.net.NetworkInfo;
import android.net.NetworkRequest;
import android.net.RouteInfo;
import android.net.Uri;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
@@ -769,14 +768,8 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
}
private void refreshWifiType() {
final ConnectedInfo connectedInfo = mWifiEntry.getConnectedInfo();
if (connectedInfo == null) {
mTypePref.setVisible(false);
return;
}
final int typeString = getWifiStandardTypeString(connectedInfo.wifiStandard);
if (typeString != -1) {
final String typeString = mWifiEntry.getStandardString();
if (!TextUtils.isEmpty(typeString)) {
mTypePref.setSummary(typeString);
mTypePref.setVisible(true);
} else {
@@ -784,20 +777,6 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
}
}
private int getWifiStandardTypeString(int wifiStandardType) {
Log.d(TAG, "Wifi Type " + wifiStandardType);
switch (wifiStandardType) {
case ScanResult.WIFI_STANDARD_11AX:
return R.string.wifi_type_11AX;
case ScanResult.WIFI_STANDARD_11AC:
return R.string.wifi_type_11AC;
case ScanResult.WIFI_STANDARD_11N:
return R.string.wifi_type_11N;
default:
return -1;
}
}
private int getMacAddressTitle() {
if (mWifiEntry.getPrivacy() == WifiEntry.PRIVACY_RANDOMIZED_MAC) {
return mWifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED