diff options
| author | 2021-02-17 08:18:05 +0000 | |
|---|---|---|
| committer | 2021-02-17 08:18:05 +0000 | |
| commit | a37f12cea9c9d55da8991031d200f99b9db15010 (patch) | |
| tree | 84762d55feb19bf5106693be5517158504b24818 | |
| parent | 697e3060d1d91ded34135d1a13595691581f65fc (diff) | |
| parent | 08d243e70d35ce896ee825eafbebef9c1f7d7e52 (diff) | |
Merge "Do not depend on Tethering stubs in CM consts" am: 3a865fa8ac am: 08d243e70d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589693
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I350d62c085f2e12fae8a3beb82779eeeed7afb45
| -rw-r--r-- | packages/Connectivity/framework/src/android/net/ConnectivityManager.java | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/packages/Connectivity/framework/src/android/net/ConnectivityManager.java b/packages/Connectivity/framework/src/android/net/ConnectivityManager.java index 4213f8af95fc..c7bb2a75dba0 100644 --- a/packages/Connectivity/framework/src/android/net/ConnectivityManager.java +++ b/packages/Connectivity/framework/src/android/net/ConnectivityManager.java @@ -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 |