diff --git a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java index ba7628e8b97..81bdab3bd89 100644 --- a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java +++ b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java @@ -88,7 +88,6 @@ import com.android.settingslib.widget.ActionButtonsPreference; import com.android.settingslib.widget.LayoutPreference; import com.android.wifitrackerlib.WifiEntry; import com.android.wifitrackerlib.WifiEntry.ConnectCallback; -import com.android.wifitrackerlib.WifiEntry.ConnectedInfo; import com.android.wifitrackerlib.WifiEntry.DisconnectCallback; import com.android.wifitrackerlib.WifiEntry.ForgetCallback; import com.android.wifitrackerlib.WifiEntry.SignInCallback; @@ -624,32 +623,12 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle } private void refreshFrequency() { - final ConnectedInfo connectedInfo = mWifiEntry.getConnectedInfo(); - if (connectedInfo == null) { + final String bandString = mWifiEntry.getBandString(); + if (TextUtils.isEmpty(bandString)) { mFrequencyPref.setVisible(false); return; } - - // 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.setSummary(bandString); mFrequencyPref.setVisible(true); }