Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi"

2020-01-14 05:30:14 +00:00
parent 55962277bf 4dc238b5e5
commit 03c1364b16
2 changed files with 2 additions and 1 deletions
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -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_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 {
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -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;

    /**