Merge "TetheringManager API clean up" am: c686fa828b am: 06ef41cf87 (ebac445e) · Commits · e / os / android_frameworks_base

api/module-lib-current.txt

+25 −24

Original line number	Diff line number	Diff line
		@@ -72,19 +72,20 @@ package android.net {
		field public static final int TETHERING_WIFI = 0; // 0x0
		field public static final int TETHERING_WIFI_P2P = 3; // 0x3
		field public static final int TETHER_ERROR_DHCPSERVER_ERROR = 12; // 0xc
		field public static final int TETHER_ERROR_DISABLE_NAT_ERROR = 9; // 0x9
		field public static final int TETHER_ERROR_ENABLE_NAT_ERROR = 8; // 0x8
		field public static final int TETHER_ERROR_DISABLE_FORWARDING_ERROR = 9; // 0x9
		field public static final int TETHER_ERROR_ENABLE_FORWARDING_ERROR = 8; // 0x8
		field public static final int TETHER_ERROR_ENTITLEMENT_UNKNOWN = 13; // 0xd
		field public static final int TETHER_ERROR_IFACE_CFG_ERROR = 10; // 0xa
		field public static final int TETHER_ERROR_MASTER_ERROR = 5; // 0x5
		field public static final int TETHER_ERROR_INTERNAL_ERROR = 5; // 0x5
		field public static final int TETHER_ERROR_NO_ACCESS_TETHERING_PERMISSION = 15; // 0xf
		field public static final int TETHER_ERROR_NO_CHANGE_TETHERING_PERMISSION = 14; // 0xe
		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 TETHER_ERROR_PROVISIONING_FAILED = 11; // 0xb
		field public static final int TETHER_ERROR_SERVICE_UNAVAIL = 2; // 0x2
		field public static final int TETHER_ERROR_TETHER_IFACE_ERROR = 6; // 0x6
		field public static final int TETHER_ERROR_UNAVAIL_IFACE = 4; // 0x4
		field public static final int TETHER_ERROR_UNKNOWN_IFACE = 1; // 0x1
		field public static final int TETHER_ERROR_UNKNOWN_TYPE = 16; // 0x10
		field public static final int TETHER_ERROR_UNSUPPORTED = 3; // 0x3
		field public static final int TETHER_ERROR_UNTETHER_IFACE_ERROR = 7; // 0x7
		field public static final int TETHER_HARDWARE_OFFLOAD_FAILED = 2; // 0x2
		@@ -96,29 +97,26 @@ package android.net {
		method public void onTetheringEntitlementResult(int);
		}

		public abstract static class TetheringManager.StartTetheringCallback {
		ctor public TetheringManager.StartTetheringCallback();
		method public void onTetheringFailed(int);
		method public void onTetheringStarted();
		public static interface TetheringManager.StartTetheringCallback {
		method public default void onTetheringFailed(int);
		method public default void onTetheringStarted();
		}

		public abstract static class TetheringManager.TetheringEventCallback {
		ctor public TetheringManager.TetheringEventCallback();
		method public void onClientsChanged(@NonNull java.util.Collection<android.net.TetheredClient>);
		method public void onError(@NonNull String, int);
		method public void onOffloadStatusChanged(int);
		method @Deprecated public void onTetherableInterfaceRegexpsChanged(@NonNull android.net.TetheringManager.TetheringInterfaceRegexps);
		method public void onTetherableInterfacesChanged(@NonNull java.util.List<java.lang.String>);
		method public void onTetheredInterfacesChanged(@NonNull java.util.List<java.lang.String>);
		method public void onTetheringSupported(boolean);
		method public void onUpstreamChanged(@Nullable android.net.Network);
		public static interface TetheringManager.TetheringEventCallback {
		method public default void onClientsChanged(@NonNull java.util.Collection<android.net.TetheredClient>);
		method public default void onError(@NonNull String, int);
		method public default void onOffloadStatusChanged(int);
		method public default void onTetherableInterfaceRegexpsChanged(@NonNull android.net.TetheringManager.TetheringInterfaceRegexps);
		method public default void onTetherableInterfacesChanged(@NonNull java.util.List<java.lang.String>);
		method public default void onTetheredInterfacesChanged(@NonNull java.util.List<java.lang.String>);
		method public default void onTetheringSupported(boolean);
		method public default void onUpstreamChanged(@Nullable android.net.Network);
		}

		@Deprecated public static class TetheringManager.TetheringInterfaceRegexps {
		ctor @Deprecated public TetheringManager.TetheringInterfaceRegexps(@NonNull String[], @NonNull String[], @NonNull String[]);
		method @Deprecated @NonNull public java.util.List<java.lang.String> getTetherableBluetoothRegexs();
		method @Deprecated @NonNull public java.util.List<java.lang.String> getTetherableUsbRegexs();
		method @Deprecated @NonNull public java.util.List<java.lang.String> getTetherableWifiRegexs();
		public static class TetheringManager.TetheringInterfaceRegexps {
		method @NonNull public java.util.List<java.lang.String> getTetherableBluetoothRegexs();
		method @NonNull public java.util.List<java.lang.String> getTetherableUsbRegexs();
		method @NonNull public java.util.List<java.lang.String> getTetherableWifiRegexs();
		}

		public static class TetheringManager.TetheringRequest {
		@@ -129,8 +127,11 @@ package android.net {
		method @NonNull public android.net.TetheringManager.TetheringRequest build();
		method @Nullable public android.net.LinkAddress getClientStaticIpv4Address();
		method @Nullable public android.net.LinkAddress getLocalIpv4Address();
		method public boolean getShouldShowEntitlementUi();
		method public int getTetheringType();
		method public boolean isExemptFromEntitlementCheck();
		method @NonNull @RequiresPermission("android.permission.TETHER_PRIVILEGED") public android.net.TetheringManager.TetheringRequest.Builder setExemptFromEntitlementCheck(boolean);
		method @NonNull @RequiresPermission("android.permission.TETHER_PRIVILEGED") public android.net.TetheringManager.TetheringRequest.Builder setSilentProvisioning(boolean);
		method @NonNull @RequiresPermission("android.permission.TETHER_PRIVILEGED") public android.net.TetheringManager.TetheringRequest.Builder setShouldShowEntitlementUi(boolean);
		method @NonNull @RequiresPermission("android.permission.TETHER_PRIVILEGED") public android.net.TetheringManager.TetheringRequest.Builder setStaticIpv4Addresses(@NonNull android.net.LinkAddress, @NonNull android.net.LinkAddress);
		}

api/system-current.txt

+20 −26

Original line number	Diff line number	Diff line
		@@ -4880,19 +4880,20 @@ package android.net {
		field public static final int TETHERING_WIFI = 0; // 0x0
		field public static final int TETHERING_WIFI_P2P = 3; // 0x3
		field public static final int TETHER_ERROR_DHCPSERVER_ERROR = 12; // 0xc
		field public static final int TETHER_ERROR_DISABLE_NAT_ERROR = 9; // 0x9
		field public static final int TETHER_ERROR_ENABLE_NAT_ERROR = 8; // 0x8
		field public static final int TETHER_ERROR_DISABLE_FORWARDING_ERROR = 9; // 0x9
		field public static final int TETHER_ERROR_ENABLE_FORWARDING_ERROR = 8; // 0x8
		field public static final int TETHER_ERROR_ENTITLEMENT_UNKNOWN = 13; // 0xd
		field public static final int TETHER_ERROR_IFACE_CFG_ERROR = 10; // 0xa
		field public static final int TETHER_ERROR_MASTER_ERROR = 5; // 0x5
		field public static final int TETHER_ERROR_INTERNAL_ERROR = 5; // 0x5
		field public static final int TETHER_ERROR_NO_ACCESS_TETHERING_PERMISSION = 15; // 0xf
		field public static final int TETHER_ERROR_NO_CHANGE_TETHERING_PERMISSION = 14; // 0xe
		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 TETHER_ERROR_PROVISIONING_FAILED = 11; // 0xb
		field public static final int TETHER_ERROR_SERVICE_UNAVAIL = 2; // 0x2
		field public static final int TETHER_ERROR_TETHER_IFACE_ERROR = 6; // 0x6
		field public static final int TETHER_ERROR_UNAVAIL_IFACE = 4; // 0x4
		field public static final int TETHER_ERROR_UNKNOWN_IFACE = 1; // 0x1
		field public static final int TETHER_ERROR_UNKNOWN_TYPE = 16; // 0x10
		field public static final int TETHER_ERROR_UNSUPPORTED = 3; // 0x3
		field public static final int TETHER_ERROR_UNTETHER_IFACE_ERROR = 7; // 0x7
		field public static final int TETHER_HARDWARE_OFFLOAD_FAILED = 2; // 0x2
		@@ -4904,29 +4905,19 @@ package android.net {
		method public void onTetheringEntitlementResult(int);
		}

		public abstract static class TetheringManager.StartTetheringCallback {
		ctor public TetheringManager.StartTetheringCallback();
		method public void onTetheringFailed(int);
		method public void onTetheringStarted();
		public static interface TetheringManager.StartTetheringCallback {
		method public default void onTetheringFailed(int);
		method public default void onTetheringStarted();
		}

		public abstract static class TetheringManager.TetheringEventCallback {
		ctor public TetheringManager.TetheringEventCallback();
		method public void onClientsChanged(@NonNull java.util.Collection<android.net.TetheredClient>);
		method public void onError(@NonNull String, int);
		method public void onOffloadStatusChanged(int);
		method @Deprecated public void onTetherableInterfaceRegexpsChanged(@NonNull android.net.TetheringManager.TetheringInterfaceRegexps);
		method public void onTetherableInterfacesChanged(@NonNull java.util.List<java.lang.String>);
		method public void onTetheredInterfacesChanged(@NonNull java.util.List<java.lang.String>);
		method public void onTetheringSupported(boolean);
		method public void onUpstreamChanged(@Nullable android.net.Network);
		}

		@Deprecated public static class TetheringManager.TetheringInterfaceRegexps {
		ctor @Deprecated public TetheringManager.TetheringInterfaceRegexps(@NonNull String[], @NonNull String[], @NonNull String[]);
		method @Deprecated @NonNull public java.util.List<java.lang.String> getTetherableBluetoothRegexs();
		method @Deprecated @NonNull public java.util.List<java.lang.String> getTetherableUsbRegexs();
		method @Deprecated @NonNull public java.util.List<java.lang.String> getTetherableWifiRegexs();
		public static interface TetheringManager.TetheringEventCallback {
		method public default void onClientsChanged(@NonNull java.util.Collection<android.net.TetheredClient>);
		method public default void onError(@NonNull String, int);
		method public default void onOffloadStatusChanged(int);
		method public default void onTetherableInterfacesChanged(@NonNull java.util.List<java.lang.String>);
		method public default void onTetheredInterfacesChanged(@NonNull java.util.List<java.lang.String>);
		method public default void onTetheringSupported(boolean);
		method public default void onUpstreamChanged(@Nullable android.net.Network);
		}

		public static class TetheringManager.TetheringRequest {
		@@ -4937,8 +4928,11 @@ package android.net {
		method @NonNull public android.net.TetheringManager.TetheringRequest build();
		method @Nullable public android.net.LinkAddress getClientStaticIpv4Address();
		method @Nullable public android.net.LinkAddress getLocalIpv4Address();
		method public boolean getShouldShowEntitlementUi();
		method public int getTetheringType();
		method public boolean isExemptFromEntitlementCheck();
		method @NonNull @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public android.net.TetheringManager.TetheringRequest.Builder setExemptFromEntitlementCheck(boolean);
		method @NonNull @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public android.net.TetheringManager.TetheringRequest.Builder setSilentProvisioning(boolean);
		method @NonNull @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public android.net.TetheringManager.TetheringRequest.Builder setShouldShowEntitlementUi(boolean);
		method @NonNull @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public android.net.TetheringManager.TetheringRequest.Builder setStaticIpv4Addresses(@NonNull android.net.LinkAddress, @NonNull android.net.LinkAddress);
		}

api/test-current.txt

+20 −26

Original line number	Diff line number	Diff line
		@@ -1609,19 +1609,20 @@ package android.net {
		field public static final int TETHERING_WIFI = 0; // 0x0
		field public static final int TETHERING_WIFI_P2P = 3; // 0x3
		field public static final int TETHER_ERROR_DHCPSERVER_ERROR = 12; // 0xc
		field public static final int TETHER_ERROR_DISABLE_NAT_ERROR = 9; // 0x9
		field public static final int TETHER_ERROR_ENABLE_NAT_ERROR = 8; // 0x8
		field public static final int TETHER_ERROR_DISABLE_FORWARDING_ERROR = 9; // 0x9
		field public static final int TETHER_ERROR_ENABLE_FORWARDING_ERROR = 8; // 0x8
		field public static final int TETHER_ERROR_ENTITLEMENT_UNKNOWN = 13; // 0xd
		field public static final int TETHER_ERROR_IFACE_CFG_ERROR = 10; // 0xa
		field public static final int TETHER_ERROR_MASTER_ERROR = 5; // 0x5
		field public static final int TETHER_ERROR_INTERNAL_ERROR = 5; // 0x5
		field public static final int TETHER_ERROR_NO_ACCESS_TETHERING_PERMISSION = 15; // 0xf
		field public static final int TETHER_ERROR_NO_CHANGE_TETHERING_PERMISSION = 14; // 0xe
		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 TETHER_ERROR_PROVISIONING_FAILED = 11; // 0xb
		field public static final int TETHER_ERROR_SERVICE_UNAVAIL = 2; // 0x2
		field public static final int TETHER_ERROR_TETHER_IFACE_ERROR = 6; // 0x6
		field public static final int TETHER_ERROR_UNAVAIL_IFACE = 4; // 0x4
		field public static final int TETHER_ERROR_UNKNOWN_IFACE = 1; // 0x1
		field public static final int TETHER_ERROR_UNKNOWN_TYPE = 16; // 0x10
		field public static final int TETHER_ERROR_UNSUPPORTED = 3; // 0x3
		field public static final int TETHER_ERROR_UNTETHER_IFACE_ERROR = 7; // 0x7
		field public static final int TETHER_HARDWARE_OFFLOAD_FAILED = 2; // 0x2
		@@ -1633,29 +1634,19 @@ package android.net {
		method public void onTetheringEntitlementResult(int);
		}

		public abstract static class TetheringManager.StartTetheringCallback {
		ctor public TetheringManager.StartTetheringCallback();
		method public void onTetheringFailed(int);
		method public void onTetheringStarted();
		public static interface TetheringManager.StartTetheringCallback {
		method public default void onTetheringFailed(int);
		method public default void onTetheringStarted();
		}

		public abstract static class TetheringManager.TetheringEventCallback {
		ctor public TetheringManager.TetheringEventCallback();
		method public void onClientsChanged(@NonNull java.util.Collection<android.net.TetheredClient>);
		method public void onError(@NonNull String, int);
		method public void onOffloadStatusChanged(int);
		method @Deprecated public void onTetherableInterfaceRegexpsChanged(@NonNull android.net.TetheringManager.TetheringInterfaceRegexps);
		method public void onTetherableInterfacesChanged(@NonNull java.util.List<java.lang.String>);
		method public void onTetheredInterfacesChanged(@NonNull java.util.List<java.lang.String>);
		method public void onTetheringSupported(boolean);
		method public void onUpstreamChanged(@Nullable android.net.Network);
		}

		@Deprecated public static class TetheringManager.TetheringInterfaceRegexps {
		ctor @Deprecated public TetheringManager.TetheringInterfaceRegexps(@NonNull String[], @NonNull String[], @NonNull String[]);
		method @Deprecated @NonNull public java.util.List<java.lang.String> getTetherableBluetoothRegexs();
		method @Deprecated @NonNull public java.util.List<java.lang.String> getTetherableUsbRegexs();
		method @Deprecated @NonNull public java.util.List<java.lang.String> getTetherableWifiRegexs();
		public static interface TetheringManager.TetheringEventCallback {
		method public default void onClientsChanged(@NonNull java.util.Collection<android.net.TetheredClient>);
		method public default void onError(@NonNull String, int);
		method public default void onOffloadStatusChanged(int);
		method public default void onTetherableInterfacesChanged(@NonNull java.util.List<java.lang.String>);
		method public default void onTetheredInterfacesChanged(@NonNull java.util.List<java.lang.String>);
		method public default void onTetheringSupported(boolean);
		method public default void onUpstreamChanged(@Nullable android.net.Network);
		}

		public static class TetheringManager.TetheringRequest {
		@@ -1666,8 +1657,11 @@ package android.net {
		method @NonNull public android.net.TetheringManager.TetheringRequest build();
		method @Nullable public android.net.LinkAddress getClientStaticIpv4Address();
		method @Nullable public android.net.LinkAddress getLocalIpv4Address();
		method public boolean getShouldShowEntitlementUi();
		method public int getTetheringType();
		method public boolean isExemptFromEntitlementCheck();
		method @NonNull @RequiresPermission("android.permission.TETHER_PRIVILEGED") public android.net.TetheringManager.TetheringRequest.Builder setExemptFromEntitlementCheck(boolean);
		method @NonNull @RequiresPermission("android.permission.TETHER_PRIVILEGED") public android.net.TetheringManager.TetheringRequest.Builder setSilentProvisioning(boolean);
		method @NonNull @RequiresPermission("android.permission.TETHER_PRIVILEGED") public android.net.TetheringManager.TetheringRequest.Builder setShouldShowEntitlementUi(boolean);
		method @NonNull @RequiresPermission("android.permission.TETHER_PRIVILEGED") public android.net.TetheringManager.TetheringRequest.Builder setStaticIpv4Addresses(@NonNull android.net.LinkAddress, @NonNull android.net.LinkAddress);
		}

core/java/android/net/ConnectivityManager.java

+19 −11

Original line number	Diff line number	Diff line
		@@ -2488,13 +2488,13 @@ public class ConnectivityManager {
		}

		@Override
		public void onTetheringFailed(final int resultCode) {
		public void onTetheringFailed(final int error) {
		callback.onTetheringFailed();
		}
		};

		final TetheringRequest request = new TetheringRequest.Builder(type)
		.setSilentProvisioning(!showProvisioningUi).build();
		.setShouldShowEntitlementUi(showProvisioningUi).build();

		mTetheringManager.startTethering(request, executor, tetheringCallback);
		}
		@@ -2714,11 +2714,12 @@ public class ConnectivityManager {
		public static final int TETHER_ERROR_UNAVAIL_IFACE =
		TetheringManager.TETHER_ERROR_UNAVAIL_IFACE;
		/**
		* @deprecated Use {@link TetheringManager#TETHER_ERROR_MASTER_ERROR}.
		* @deprecated Use {@link TetheringManager#TETHER_ERROR_INTERNAL_ERROR}.
		* {@hide}
		*/
		@Deprecated
		public static final int TETHER_ERROR_MASTER_ERROR = TetheringManager.TETHER_ERROR_MASTER_ERROR;
		public static final int TETHER_ERROR_MASTER_ERROR =
		TetheringManager.TETHER_ERROR_INTERNAL_ERROR;
		/**
		* @deprecated Use {@link TetheringManager#TETHER_ERROR_TETHER_IFACE_ERROR}.
		* {@hide}
		@@ -2734,19 +2735,19 @@ public class ConnectivityManager {
		public static final int TETHER_ERROR_UNTETHER_IFACE_ERROR =
		TetheringManager.TETHER_ERROR_UNTETHER_IFACE_ERROR;
		/**
		* @deprecated Use {@link TetheringManager#TETHER_ERROR_ENABLE_NAT_ERROR}.
		* @deprecated Use {@link TetheringManager#TETHER_ERROR_ENABLE_FORWARDING_ERROR}.
		* {@hide}
		*/
		@Deprecated
		public static final int TETHER_ERROR_ENABLE_NAT_ERROR =
		TetheringManager.TETHER_ERROR_ENABLE_NAT_ERROR;
		TetheringManager.TETHER_ERROR_ENABLE_FORWARDING_ERROR;
		/**
		* @deprecated Use {@link TetheringManager#TETHER_ERROR_DISABLE_NAT_ERROR}.
		* @deprecated Use {@link TetheringManager#TETHER_ERROR_DISABLE_FORWARDING_ERROR}.
		* {@hide}
		*/
		@Deprecated
		public static final int TETHER_ERROR_DISABLE_NAT_ERROR =
		TetheringManager.TETHER_ERROR_DISABLE_NAT_ERROR;
		TetheringManager.TETHER_ERROR_DISABLE_FORWARDING_ERROR;
		/**
		* @deprecated Use {@link TetheringManager#TETHER_ERROR_IFACE_CFG_ERROR}.
		* {@hide}
		@@ -2755,13 +2756,13 @@ public class ConnectivityManager {
		public static final int TETHER_ERROR_IFACE_CFG_ERROR =
		TetheringManager.TETHER_ERROR_IFACE_CFG_ERROR;
		/**
		* @deprecated Use {@link TetheringManager#TETHER_ERROR_PROVISION_FAILED}.
		* @deprecated Use {@link TetheringManager#TETHER_ERROR_PROVISIONING_FAILED}.
		* {@hide}
		*/
		@SystemApi
		@Deprecated
		public static final int TETHER_ERROR_PROVISION_FAILED =
		TetheringManager.TETHER_ERROR_PROVISION_FAILED;
		TetheringManager.TETHER_ERROR_PROVISIONING_FAILED;
		/**
		* @deprecated Use {@link TetheringManager#TETHER_ERROR_DHCPSERVER_ERROR}.
		* {@hide}
		@@ -2793,7 +2794,14 @@ public class ConnectivityManager {
		@UnsupportedAppUsage
		@Deprecated
		public int getLastTetherError(String iface) {
		return mTetheringManager.getLastTetherError(iface);
		int error = mTetheringManager.getLastTetherError(iface);
		if (error == TetheringManager.TETHER_ERROR_UNKNOWN_TYPE) {
		// TETHER_ERROR_UNKNOWN_TYPE was introduced with TetheringManager and has never been
		// returned by ConnectivityManager. Convert it to the legacy TETHER_ERROR_UNKNOWN_IFACE
		// instead.
		error = TetheringManager.TETHER_ERROR_UNKNOWN_IFACE;
		}
		return error;
		}

		/** @hide */

packages/Tethering/common/TetheringLib/src/android/net/TetheringManager.java

+116 −42

File changed.

Preview size limit exceeded, changes collapsed.