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

Browse Source 
Change-Id: I310847d36d37a4d7a0c3a8675546376a300680f2
This commit is contained in:
Automerger Merge Worker
2020-01-14 06:17:26 +00:00
parent 995211c840 28220533d8
commit 8669be6a1b
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

@@ -4314,6 +4314,7 @@ package android.net {
field public static final int TETHER_ERROR_ENTITLEMENT_UNKONWN = 13; // 0xd 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_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
} }
public abstract static class ConnectivityManager.OnStartTetheringCallback { 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. * The absence of a connection type.
* @hide * @hide
*/ */
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562) @SystemApi
public static final int TYPE_NONE = -1; public static final int TYPE_NONE = -1;
/** /**