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

Add 6 GHz Wifi band to Wifi Network Details

Browse Source 
Display 6 GHz for the frequency pref in Wifi Network Details
when connected to a 6 GHz network.

Bug: 184170532
Test: build
Change-Id: I7d10fe0e4c95e6f0ec66c3a179c3c46828eeb545
This commit is contained in:
Quang Luong
2021-06-07 11:27:22 -07:00
parent ada75fbe7e
commit 1c7ba38627
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -2016,10 +2016,12 @@
<string name="wifi_display_listen_channel" translatable="false">Listen channel</string> <string name="wifi_display_listen_channel" translatable="false">Listen channel</string>
<!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] --> <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->
<string name="wifi_display_operating_channel" translatable="false">Operating channel</string> <string name="wifi_display_operating_channel" translatable="false">Operating channel</string>
<!-- Wifi 2.4GHz is used as an universal itendifier for 2.4GHz band --> <!-- Wifi 2.4GHz is used as a universal identifier for 2.4GHz band -->
<string name="wifi_band_24ghz">2.4 GHz</string> <string name="wifi_band_24ghz">2.4 GHz</string>
<!-- Wifi Internal 5GHz as an universal itendifier for 5GHz band --> <!-- Wifi Internal 5GHz as a universal identifier for 5GHz band -->
<string name="wifi_band_5ghz">5 GHz</string> <string name="wifi_band_5ghz">5 GHz</string>
<!-- Wifi 6GHz is used as a universal identifier for 6GHz band [CHAR LIMIT=40] -->
<string name="wifi_band_6ghz">6 GHz</string>
<!-- Wifi Sign in text for button [CHAR LIMIT = 40]--> <!-- Wifi Sign in text for button [CHAR LIMIT = 40]-->
<string name="wifi_sign_in_button_text">Sign in</string> <string name="wifi_sign_in_button_text">Sign in</string>
<!-- Text for button to go to Wifi venue information webpage when Wifi is a captive portal [CHAR LIMIT=40]--> <!-- Text for button to go to Wifi venue information webpage when Wifi is a captive portal [CHAR LIMIT=40]-->

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

@@ -16,7 +16,6 @@
package com.android.settings.wifi; package com.android.settings.wifi;
import android.app.Activity;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -35,7 +34,6 @@ import android.net.wifi.WifiEnterpriseConfig.Eap;
import android.net.wifi.WifiEnterpriseConfig.Phase2; import android.net.wifi.WifiEnterpriseConfig.Phase2;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.IBinder; import android.os.IBinder;
import android.os.UserHandle;
import android.security.keystore.KeyProperties; import android.security.keystore.KeyProperties;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
@@ -402,6 +400,9 @@ public class WifiConfigController2 implements TextWatcher,
} else if (frequency >= WifiEntry.MIN_FREQ_5GHZ } else if (frequency >= WifiEntry.MIN_FREQ_5GHZ
&& frequency < WifiEntry.MAX_FREQ_5GHZ) { && frequency < WifiEntry.MAX_FREQ_5GHZ) {
band = res.getString(R.string.wifi_band_5ghz); band = res.getString(R.string.wifi_band_5ghz);
} else if (frequency >= WifiEntry.MIN_FREQ_6GHZ
&& frequency < WifiEntry.MAX_FREQ_6GHZ) {
band = res.getString(R.string.wifi_band_6ghz);
} else { } else {
Log.e(TAG, "Unexpected frequency " + frequency); Log.e(TAG, "Unexpected frequency " + frequency);
} }

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

@@ -623,12 +623,16 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
return; 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; final int frequency = connectedInfo.frequencyMhz;
String band = null; String band = null;
if (frequency >= WifiEntry.MIN_FREQ_24GHZ && frequency < WifiEntry.MAX_FREQ_24GHZ) { if (frequency >= WifiEntry.MIN_FREQ_24GHZ && frequency < WifiEntry.MAX_FREQ_24GHZ) {
band = mContext.getResources().getString(R.string.wifi_band_24ghz); band = mContext.getResources().getString(R.string.wifi_band_24ghz);
} else if (frequency >= WifiEntry.MIN_FREQ_5GHZ && frequency < WifiEntry.MAX_FREQ_5GHZ) { } else if (frequency >= WifiEntry.MIN_FREQ_5GHZ && frequency < WifiEntry.MAX_FREQ_5GHZ) {
band = mContext.getResources().getString(R.string.wifi_band_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 { } else {
// Connecting state is unstable, make it disappeared if unexpected // Connecting state is unstable, make it disappeared if unexpected
if (mWifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTING) { if (mWifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTING) {