LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Do not depend on Tethering stubs in CM consts"

Browse Source
This commit is contained in:
Treehugger Robot
2021-02-17 07:11:38 +00:00
committed by Gerrit Code Review
parent 542c253697 09f8ed2862
commit 37fd048a06
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
framework/src/android/net/ConnectivityManager.java
View File

@@ -456,7 +456,7 @@ public class ConnectivityManager {
* @hide * @hide
*/ */
@SystemApi @SystemApi
public static final int TETHERING_WIFI = TetheringManager.TETHERING_WIFI; public static final int TETHERING_WIFI = 0;
/** /**
* USB tethering type. * USB tethering type.
@@ -464,7 +464,7 @@ public class ConnectivityManager {
* @hide * @hide
*/ */
@SystemApi @SystemApi
public static final int TETHERING_USB = TetheringManager.TETHERING_USB; public static final int TETHERING_USB = 1;
/** /**
* Bluetooth tethering type. * Bluetooth tethering type.
@@ -472,7 +472,7 @@ public class ConnectivityManager {
* @hide * @hide
*/ */
@SystemApi @SystemApi
public static final int TETHERING_BLUETOOTH = TetheringManager.TETHERING_BLUETOOTH; public static final int TETHERING_BLUETOOTH = 2;
/** /**
* Wifi P2p tethering type. * Wifi P2p tethering type.
@@ -2799,7 +2799,7 @@ public class ConnectivityManager {
*/ */
@SystemApi @SystemApi
@Deprecated @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}. * @deprecated Use {@link TetheringManager#TETHER_ERROR_UNKNOWN_IFACE}.
* {@hide} * {@hide}
@@ -2875,8 +2875,7 @@ public class ConnectivityManager {
*/ */
@SystemApi @SystemApi
@Deprecated @Deprecated
public static final int TETHER_ERROR_PROVISION_FAILED = public static final int TETHER_ERROR_PROVISION_FAILED = 11;
TetheringManager.TETHER_ERROR_PROVISIONING_FAILED;
/** /**
* @deprecated Use {@link TetheringManager#TETHER_ERROR_DHCPSERVER_ERROR}. * @deprecated Use {@link TetheringManager#TETHER_ERROR_DHCPSERVER_ERROR}.
* {@hide} * {@hide}
@@ -2890,8 +2889,7 @@ public class ConnectivityManager {
*/ */
@SystemApi @SystemApi
@Deprecated @Deprecated
public static final int TETHER_ERROR_ENTITLEMENT_UNKONWN = public static final int TETHER_ERROR_ENTITLEMENT_UNKONWN = 13;
TetheringManager.TETHER_ERROR_ENTITLEMENT_UNKNOWN;
/** /**
* Get a more detailed error code after a Tethering or Untethering * Get a more detailed error code after a Tethering or Untethering