Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi"

This commit is contained in:
Treehugger Robot
2020-01-15 11:42:11 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 1 deletions

View File

@@ -4318,6 +4318,7 @@ package android.net {
field public static final int TETHER_ERROR_NO_ERROR = 0; // 0x0 field public static final int TETHER_ERROR_NO_ERROR = 0; // 0x0
field public static final int TETHER_ERROR_PROVISION_FAILED = 11; // 0xb field public static final int TETHER_ERROR_PROVISION_FAILED = 11; // 0xb
field public static final int TYPE_NONE = -1; // 0xffffffff field public static final int TYPE_NONE = -1; // 0xffffffff
field @Deprecated public static final int TYPE_WIFI_P2P = 13; // 0xd
} }
public abstract static class ConnectivityManager.OnStartTetheringCallback { public abstract static class ConnectivityManager.OnStartTetheringCallback {

View File

@@ -662,7 +662,7 @@ public class ConnectivityManager {
* {@hide} * {@hide}
*/ */
@Deprecated @Deprecated
@UnsupportedAppUsage @SystemApi
public static final int TYPE_WIFI_P2P = 13; public static final int TYPE_WIFI_P2P = 13;
/** /**