Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi"

Browse Source 
am: dda5e92547

Change-Id: I27cb6214bf5a42c9120dd871228b224cd41e1199
This commit is contained in:
paulhu
2020-01-15 04:03:29 -08:00
committed by android-build-merger
parent 80cc1ede37 dda5e92547
commit fe7146187e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
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 {

2
core/java/android/net/ConnectivityManager.java
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;
/** /**