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

Merge "Use WifiEntry.getBandString() to show band for Frequency preference"

Browse Source
This commit is contained in:
Quang Luong
2022-04-28 20:29:40 +00:00
committed by Android (Google) Code Review
parent 626169306f 168e2f8f4b
commit aa7a544c93
1 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,6 @@ import com.android.settingslib.widget.ActionButtonsPreference;
import com.android.settingslib.widget.LayoutPreference; import com.android.settingslib.widget.LayoutPreference;
import com.android.wifitrackerlib.WifiEntry; import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiEntry.ConnectCallback; import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
import com.android.wifitrackerlib.WifiEntry.ConnectedInfo;
import com.android.wifitrackerlib.WifiEntry.DisconnectCallback; import com.android.wifitrackerlib.WifiEntry.DisconnectCallback;
import com.android.wifitrackerlib.WifiEntry.ForgetCallback; import com.android.wifitrackerlib.WifiEntry.ForgetCallback;
import com.android.wifitrackerlib.WifiEntry.SignInCallback; import com.android.wifitrackerlib.WifiEntry.SignInCallback;
@@ -624,32 +623,12 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
} }
private void refreshFrequency() { private void refreshFrequency() {
final ConnectedInfo connectedInfo = mWifiEntry.getConnectedInfo(); final String bandString = mWifiEntry.getBandString();
if (connectedInfo == null) { if (TextUtils.isEmpty(bandString)) {
mFrequencyPref.setVisible(false); mFrequencyPref.setVisible(false);
return; return;
} }
mFrequencyPref.setSummary(bandString);
// TODO(b/190390803): We should get the band string directly from WifiEntry.ConnectedInfo
// instead of doing the frequency -> band conversion here.
final int frequency = connectedInfo.frequencyMhz;
String band = null;
if (frequency >= WifiEntry.MIN_FREQ_24GHZ && frequency < WifiEntry.MAX_FREQ_24GHZ) {
band = mContext.getResources().getString(R.string.wifi_band_24ghz);
} else if (frequency >= WifiEntry.MIN_FREQ_5GHZ && frequency < WifiEntry.MAX_FREQ_5GHZ) {
band = mContext.getResources().getString(R.string.wifi_band_5ghz);
} else if (frequency >= WifiEntry.MIN_FREQ_6GHZ && frequency < WifiEntry.MAX_FREQ_6GHZ) {
band = mContext.getResources().getString(R.string.wifi_band_6ghz);
} else {
// Connecting state is unstable, make it disappeared if unexpected
if (mWifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTING) {
mFrequencyPref.setVisible(false);
} else {
Log.e(TAG, "Unexpected frequency " + frequency);
}
return;
}
mFrequencyPref.setSummary(band);
mFrequencyPref.setVisible(true); mFrequencyPref.setVisible(true);
} }