Merge "Tethering: Add WiGig support" am: 65fadfc134 am: 6c5b5b0803 am: fdf89ee7fb am: 45fa4f9c88 am: 5131fee94b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1177323 Change-Id: I2d3971390e897be6669d2f2d4b261eb73875c267
2020-06-23 00:09:17 +00:00
parent cfdacf32f9 5131fee94b
commit 93743bb990
6 changed files with 30 additions and 2 deletions
--- a/Tethering/common/TetheringLib/src/android/net/TetheringManager.java
+++ b/Tethering/common/TetheringLib/src/android/net/TetheringManager.java
@@ -171,6 +171,14 @@ public class TetheringManager {
     */
    public static final int TETHERING_ETHERNET = 5;

+    /**
+     * WIGIG tethering type. Use a separate type to prevent
+     * conflicts with TETHERING_WIFI
+     * This type is only used internally by the tethering module
+     * @hide
+     */
+    public static final int TETHERING_WIGIG = 6;
+
    /** @hide */
    @Retention(RetentionPolicy.SOURCE)
    @IntDef(value = {