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

Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: 03c1364b16 am: 28220533d8 am: 8669be6a1b

Browse Source 
Change-Id: I5706151c291cbdbc3a1f73ebb3669f56a61509ba
This commit is contained in:
Automerger Merge Worker
2020-01-14 06:27:10 +00:00
parent 89932ee6ae 8669be6a1b
commit ee209e1194
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

@@ -4816,6 +4816,7 @@ package android.net {
field public static final int TETHER_ERROR_ENTITLEMENT_UNKONWN = 13; // 0xd
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 TYPE_NONE = -1; // 0xffffffff
}
public abstract static class ConnectivityManager.OnStartTetheringCallback {

2
core/java/android/net/ConnectivityManager.java
View File

@@ -517,7 +517,7 @@ public class ConnectivityManager {
* The absence of a connection type.
* @hide
*/
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562)
@SystemApi
public static final int TYPE_NONE = -1;
/**