Merge "p2p: mirgrate p2p into tethering modes" am: baf9025bbf am: fbb3f48d47 am: 2afadcb2e6

am: e41f14ad98

Change-Id: I069022ca21c0a09ac2eab1b97436223df99a3b1b
This commit is contained in:
Jimmy Chen
2019-10-17 23:25:44 -07:00
committed by android-build-merger

View File

@@ -472,6 +472,14 @@ public class ConnectivityManager {
@SystemApi
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.