Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8669be6a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: 03c1364b am: 28220533

Change-Id: I310847d36d37a4d7a0c3a8675546376a300680f2
parents 995211c8 28220533
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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 {
+1 −1
Original line number Diff line number Diff line
@@ -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;

    /**