diff options
| author | Mark Chien <markchien@google.com> | 2020-06-23 00:09:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 00:09:17 +0000 |
| commit | 93743bb9902f153e5274a038d2985a40a46b5c6e (patch) | |
| tree | 864740041bcb56c1541af5d09425a3cb52430448 /Tethering/common/TetheringLib/src/android/net/TetheringManager.java | |
| parent | cfdacf32f97fa9c4feff4ca50092d3f126f7f5c4 (diff) | |
| parent | 5131fee94be7c7dc238a4da245eb65c96199f718 (diff) | |
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
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 4a8ccea5f2..7483bac116 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 = { |