commit 0b4449174450eb8f1adcbcf7af3414d4536093fe
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 28 07:51:07 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 28 07:51:07 2021 +0000
tree c143c6f58eb09c8d176990d36316b054c4927c00
parent 72f59b3019c49f1473dbe239c2a9dd199f01de2f
parent 8f9705126a5ad1c955fffd6427d434d15188341d

Merge "Remove wigig support from S tethering"

Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java

diff --git a/Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java b/Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java
index 31fcea4..d2f44d3 100644
--- a/Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java
+++ b/Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java
@@ -176,7 +176,9 @@
         // 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(