From cc77000d9a3d7e19fcbaa92b9f4ccd3f707286c4 Mon Sep 17 00:00:00 2001 From: Treehugger Robot Date: Mon, 28 Jun 2021 08:16:56 +0000 Subject: [PATCH] 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 --- .../networkstack/tethering/TetheringConfiguration.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java b/Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java index 31fcea4b62..d2f44d3a95 100644 --- a/Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java +++ b/Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java @@ -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(