Merge "wifi: support 60GHz scan" am: 238920e2f5

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

Change-Id: I42c899c1f0fc3a8d3c9b349b49930705754b6b56
This commit is contained in:
Jimmy Chen
2020-09-11 02:08:57 +00:00
committed by Automerger Merge Worker

View File

@@ -1048,6 +1048,7 @@ public class WifiNl80211Manager {
* {@link WifiScanner#WIFI_BAND_5_GHZ},
* {@link WifiScanner#WIFI_BAND_5_GHZ_DFS_ONLY},
* {@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.
* @throws IllegalArgumentException if band is not recognized.
*/
@@ -1071,6 +1072,9 @@ public class WifiNl80211Manager {
case WifiScanner.WIFI_BAND_6_GHZ:
result = mWificond.getAvailable6gChannels();
break;
case WifiScanner.WIFI_BAND_60_GHZ:
result = mWificond.getAvailable60gChannels();
break;
default:
throw new IllegalArgumentException("unsupported band " + band);
}