diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2020-06-24 04:41:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 04:41:15 +0000 |
| commit | 96a0513a9071dee677d34c9f849568b0fcd57f50 (patch) | |
| tree | b320aed9936c5d722600337374ac92b680f78265 /Tethering/common/TetheringLib/src/android/net/TetheringManager.java | |
| parent | 4b0912d2486e85f82a750b680992cf545f5095d8 (diff) | |
| parent | 4dd87aafc0062d455d5bf0aee7169d2c6b3b3039 (diff) | |
Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638
Change-Id: I6ceddc20bdec83e23039b9566187c3cbaff79176
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 cc095a0bb4..4f053cb65c 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 = { |