diff options
| author | Mark Chien <markchien@google.com> | 2020-06-22 23:45:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-22 23:45:04 +0000 |
| commit | 45fa4f9c8848c3bc4da2e2041aa1bc63f211532d (patch) | |
| tree | 2b075ac8186595282fb262e08efb91450fa19c4b /Tethering/common/TetheringLib/src/android/net/TetheringManager.java | |
| parent | ffdf42bc642e852427c84bc5982b902ff1723450 (diff) | |
| parent | fdf89ee7fb4eb9573c2908664f02d35cb909a704 (diff) | |
Merge "Tethering: Add WiGig support" am: 65fadfc134 am: 6c5b5b0803 am: fdf89ee7fb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1177323
Change-Id: Ib53b8bb0f325661ed1919978220b3a4a503b9ae8
Diffstat (limited to 'Tethering/common/TetheringLib/src/android/net/TetheringManager.java')
| -rw-r--r-- | Tethering/common/TetheringLib/src/android/net/TetheringManager.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Tethering/common/TetheringLib/src/android/net/TetheringManager.java b/Tethering/common/TetheringLib/src/android/net/TetheringManager.java index 05af5c9d0e..d36cf934b0 100644 --- 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 = { |