summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJimmy Chen <jimmycmchen@google.com>2019-10-17 23:06:04 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-17 23:06:04 -0700
commit58d08de0c620ca047ba4cee86c7d534a059cd49b (patch)
tree2dbfe2cd11436121e7e638ef7464f94b7656a2f6 /core/java/android
parent0688f9b6b13dd26ad8bda9390003b54a048bbf31 (diff)
parent8a9a9adaebbabf152b63231c0be5e3cf3ff54070 (diff)
Merge "p2p: mirgrate p2p into tethering modes"
am: 8a9a9adaeb Change-Id: Ib8f43d77a5f57965fa217e6e92eb9773e7914b54
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/net/ConnectivityManager.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 5c65238b3ef1..cfa3934b0cae 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -473,6 +473,14 @@ public class ConnectivityManager {
public static final int TETHERING_BLUETOOTH = 2;
/**
+ * Wifi P2p tethering type.
+ * Wifi P2p tethering is set through events automatically, and don't
+ * need to start from #startTethering(int, boolean, OnStartTetheringCallback).
+ * @hide
+ */
+ public static final int TETHERING_WIFI_P2P = 3;
+
+ /**
* Extra used for communicating with the TetherService. Includes the type of tethering to
* enable if any.
* @hide