Remove wigig support from S tethering

Bug: 176520801
Test: atest TetheringTests
Original-Change: https://android-review.googlesource.com/1744652
Merged-In: Id0bf02c01419e0c69a1d0b6a41789826538444d3
Change-Id: Id0bf02c01419e0c69a1d0b6a41789826538444d3
This commit is contained in:
Treehugger Robot
2021-06-28 08:16:56 +00:00
committed by Mark Chien
parent e4132c8ca0
commit cc77000d9a

View File

@@ -176,7 +176,9 @@ public class TetheringConfiguration {
// us an interface name. Careful consideration needs to be given to
// implications for Settings and for provisioning checks.
tetherableWifiRegexs = getResourceStringArray(res, R.array.config_tether_wifi_regexs);
tetherableWigigRegexs = getResourceStringArray(res, R.array.config_tether_wigig_regexs);
// TODO: Remove entire wigig code once tethering module no longer support R devices.
tetherableWigigRegexs = SdkLevel.isAtLeastS()
? new String[0] : getResourceStringArray(res, R.array.config_tether_wigig_regexs);
tetherableWifiP2pRegexs = getResourceStringArray(
res, R.array.config_tether_wifi_p2p_regexs);
tetherableBluetoothRegexs = getResourceStringArray(