Merge "wifi: support 60GHz scan"

This commit is contained in:
Jimmy Chen
2020-09-11 02:07:54 +00:00
committed by Android (Google) Code Review

View File

@@ -1048,6 +1048,7 @@ public class WifiNl80211Manager {
* {@link WifiScanner#WIFI_BAND_5_GHZ}, * {@link WifiScanner#WIFI_BAND_5_GHZ},
* {@link WifiScanner#WIFI_BAND_5_GHZ_DFS_ONLY}, * {@link WifiScanner#WIFI_BAND_5_GHZ_DFS_ONLY},
* {@link WifiScanner#WIFI_BAND_6_GHZ} * {@link WifiScanner#WIFI_BAND_6_GHZ}
* {@link WifiScanner.WIFI_BAND_60_GHZ}
* @return frequencies vector of valid frequencies (MHz), or an empty array for error. * @return frequencies vector of valid frequencies (MHz), or an empty array for error.
* @throws IllegalArgumentException if band is not recognized. * @throws IllegalArgumentException if band is not recognized.
*/ */
@@ -1071,6 +1072,9 @@ public class WifiNl80211Manager {
case WifiScanner.WIFI_BAND_6_GHZ: case WifiScanner.WIFI_BAND_6_GHZ:
result = mWificond.getAvailable6gChannels(); result = mWificond.getAvailable6gChannels();
break; break;
case WifiScanner.WIFI_BAND_60_GHZ:
result = mWificond.getAvailable60gChannels();
break;
default: default:
throw new IllegalArgumentException("unsupported band " + band); throw new IllegalArgumentException("unsupported band " + band);
} }