Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Wifi: Add definitions for 6GHz" into rvc-dev am: 7ccfc086e4 am: 4d8c041377

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11688818

Change-Id: Ia2bea564fb2d86eb354c26dfb0e0b60adb9b6fc2
This commit is contained in:
Ahmed ElArabawy
2020-06-03 21:40:23 +00:00
committed by Automerger Merge Worker
parent 25970e27b7 4d8c041377
commit 28dbf4047f
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/proto/android/server/connectivity/data_stall_event.proto
View File

@@ -32,6 +32,7 @@ enum ApBand {
AP_BAND_UNKNOWN = 0; AP_BAND_UNKNOWN = 0;
AP_BAND_2GHZ = 1; AP_BAND_2GHZ = 1;
AP_BAND_5GHZ = 2; AP_BAND_5GHZ = 2;
AP_BAND_6GHZ = 3;
} }
// Refer to definition in TelephonyManager.java. // Refer to definition in TelephonyManager.java.

9
wifi/java/android/net/wifi/WifiInfo.java
View File

@@ -632,7 +632,6 @@ public class WifiInfo implements Parcelable {
/** /**
* @hide * @hide
* TODO: makes real freq boundaries
*/ */
public boolean is24GHz() { public boolean is24GHz() {
return ScanResult.is24GHz(mFrequency); return ScanResult.is24GHz(mFrequency);
@@ -640,13 +639,19 @@ public class WifiInfo implements Parcelable {
/** /**
* @hide * @hide
* TODO: makes real freq boundaries
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage
public boolean is5GHz() { public boolean is5GHz() {
return ScanResult.is5GHz(mFrequency); return ScanResult.is5GHz(mFrequency);
} }
/**
* @hide
*/
public boolean is6GHz() {
return ScanResult.is6GHz(mFrequency);
}
/** /**
* Record the MAC address of the WLAN interface * Record the MAC address of the WLAN interface
* @param macAddress the MAC address in {@code XX:XX:XX:XX:XX:XX} form * @param macAddress the MAC address in {@code XX:XX:XX:XX:XX:XX} form