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

Commit a37f12ce authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not depend on Tethering stubs in CM consts" am: 3a865fa8 am: 08d243e7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589693

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I350d62c085f2e12fae8a3beb82779eeeed7afb45
parents 697e3060 08d243e7

packages/Connectivity/framework/src/android/net/ConnectivityManager.java

+6 −8
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ public class ConnectivityManager { 
     * @hide

     */

    @SystemApi

    public static final int TETHERING_WIFI      = TetheringManager.TETHERING_WIFI;

    public static final int TETHERING_WIFI      = 0;



    /**

     * USB tethering type.
@@ -464,7 +464,7 @@ public class ConnectivityManager { 
     * @hide

     */

    @SystemApi

    public static final int TETHERING_USB       = TetheringManager.TETHERING_USB;

    public static final int TETHERING_USB       = 1;



    /**

     * Bluetooth tethering type.
@@ -472,7 +472,7 @@ public class ConnectivityManager { 
     * @hide

     */

    @SystemApi

    public static final int TETHERING_BLUETOOTH = TetheringManager.TETHERING_BLUETOOTH;

    public static final int TETHERING_BLUETOOTH = 2;



    /**

     * Wifi P2p tethering type.
@@ -2799,7 +2799,7 @@ public class ConnectivityManager { 
     */

    @SystemApi

    @Deprecated

    public static final int TETHER_ERROR_NO_ERROR = TetheringManager.TETHER_ERROR_NO_ERROR;

    public static final int TETHER_ERROR_NO_ERROR = 0;

    /**

     * @deprecated Use {@link TetheringManager#TETHER_ERROR_UNKNOWN_IFACE}.

     * {@hide}
@@ -2875,8 +2875,7 @@ public class ConnectivityManager { 
     */

    @SystemApi

    @Deprecated

    public static final int TETHER_ERROR_PROVISION_FAILED =

            TetheringManager.TETHER_ERROR_PROVISIONING_FAILED;

    public static final int TETHER_ERROR_PROVISION_FAILED = 11;

    /**

     * @deprecated Use {@link TetheringManager#TETHER_ERROR_DHCPSERVER_ERROR}.

     * {@hide}
@@ -2890,8 +2889,7 @@ public class ConnectivityManager { 
     */

    @SystemApi

    @Deprecated

    public static final int TETHER_ERROR_ENTITLEMENT_UNKONWN =

            TetheringManager.TETHER_ERROR_ENTITLEMENT_UNKNOWN;

    public static final int TETHER_ERROR_ENTITLEMENT_UNKONWN = 13;



    /**

     * Get a more detailed error code after a Tethering or Untethering