Merge "Add support for Ethernet tethering" (d2d2ea29) · Commits · e / os / android_frameworks_base

api/system-current.txt

+15 −0

Original line number	Diff line number	Diff line
		@@ -1780,6 +1780,7 @@ package android.content {
		field public static final String BUGREPORT_SERVICE = "bugreport";
		field public static final String CONTENT_SUGGESTIONS_SERVICE = "content_suggestions";
		field public static final String CONTEXTHUB_SERVICE = "contexthub";
		field public static final String ETHERNET_SERVICE = "ethernet";
		field public static final String EUICC_CARD_SERVICE = "euicc_card";
		field public static final String HDMI_CONTROL_SERVICE = "hdmi_control";
		field public static final String NETD_SERVICE = "netd";
		@@ -6078,6 +6079,19 @@ package android.net {
		method @Deprecated public void onUpstreamChanged(@Nullable android.net.Network);
		}

		public class EthernetManager {
		method @NonNull public android.net.EthernetManager.TetheredInterfaceRequest requestTetheredInterface(@NonNull android.net.EthernetManager.TetheredInterfaceCallback);
		}

		public static interface EthernetManager.TetheredInterfaceCallback {
		method public void onAvailable(@NonNull String);
		method public void onUnavailable();
		}

		public static class EthernetManager.TetheredInterfaceRequest {
		method public void release();
		}

		public class InvalidPacketException extends java.lang.Exception {
		ctor public InvalidPacketException(int);
		field public static final int ERROR_INVALID_IP_ADDRESS = -21; // 0xffffffeb
		@@ -6507,6 +6521,7 @@ package android.net {
		field public static final String EXTRA_AVAILABLE_TETHER = "availableArray";
		field public static final String EXTRA_ERRORED_TETHER = "erroredArray";
		field public static final int TETHERING_BLUETOOTH = 2; // 0x2
		field public static final int TETHERING_ETHERNET = 5; // 0x5
		field public static final int TETHERING_INVALID = -1; // 0xffffffff
		field public static final int TETHERING_NCM = 4; // 0x4
		field public static final int TETHERING_USB = 1; // 0x1

api/test-current.txt

+15 −0

Original line number	Diff line number	Diff line
		@@ -771,6 +771,7 @@ package android.content {
		field public static final String BUGREPORT_SERVICE = "bugreport";
		field public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture";
		field public static final String DEVICE_IDLE_CONTROLLER = "deviceidle";
		field public static final String ETHERNET_SERVICE = "ethernet";
		field public static final String NETWORK_STACK_SERVICE = "network_stack";
		field public static final String PERMISSION_SERVICE = "permission";
		field public static final String POWER_WHITELIST_MANAGER = "power_whitelist";
		@@ -1612,6 +1613,19 @@ package android.net {
		field public static final String EXTRA_CAPTIVE_PORTAL_USER_AGENT = "android.net.extra.CAPTIVE_PORTAL_USER_AGENT";
		}

		public class EthernetManager {
		method @NonNull public android.net.EthernetManager.TetheredInterfaceRequest requestTetheredInterface(@NonNull android.net.EthernetManager.TetheredInterfaceCallback);
		}

		public static interface EthernetManager.TetheredInterfaceCallback {
		method public void onAvailable(@NonNull String);
		method public void onUnavailable();
		}

		public static class EthernetManager.TetheredInterfaceRequest {
		method public void release();
		}

		public final class IpPrefix implements android.os.Parcelable {
		ctor public IpPrefix(@NonNull java.net.InetAddress, @IntRange(from=0, to=128) int);
		ctor public IpPrefix(@NonNull String);
		@@ -1760,6 +1774,7 @@ package android.net {
		field public static final String EXTRA_AVAILABLE_TETHER = "availableArray";
		field public static final String EXTRA_ERRORED_TETHER = "erroredArray";
		field public static final int TETHERING_BLUETOOTH = 2; // 0x2
		field public static final int TETHERING_ETHERNET = 5; // 0x5
		field public static final int TETHERING_INVALID = -1; // 0xffffffff
		field public static final int TETHERING_NCM = 4; // 0x4
		field public static final int TETHERING_USB = 1; // 0x1

core/java/android/content/Context.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -4139,16 +4139,16 @@ public abstract class Context {
		public static final String LOWPAN_SERVICE = "lowpan";

		/**
		* Use with {@link #getSystemService(String)} to retrieve a {@link
		* android.net.EthernetManager} for handling management of
		* Ethernet access.
		* Use with {@link #getSystemService(String)} to retrieve a {@link android.net.EthernetManager}
		* for handling management of Ethernet access.
		*
		* @see #getSystemService(String)
		* @see android.net.EthernetManager
		*
		* @hide
		*/
		@UnsupportedAppUsage
		@SystemApi
		@TestApi
		public static final String ETHERNET_SERVICE = "ethernet";

		/**

core/java/android/net/EthernetManager.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -17,7 +17,9 @@
		package android.net;

		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.annotation.SystemService;
		import android.annotation.TestApi;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.Context;
		import android.os.Handler;
		@@ -32,6 +34,8 @@ import java.util.Objects;
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		@SystemService(Context.ETHERNET_SERVICE)
		public class EthernetManager {
		private static final String TAG = "EthernetManager";
		@@ -62,12 +66,14 @@ public class EthernetManager {

		/**
		* A listener interface to receive notification on changes in Ethernet.
		* @hide
		*/
		public interface Listener {
		/**
		* Called when Ethernet port's availability is changed.
		* @param iface Ethernet interface name
		* @param isAvailable {@code true} if Ethernet port exists.
		* @hide
		*/
		@UnsupportedAppUsage
		void onAvailabilityChanged(String iface, boolean isAvailable);
		@@ -78,6 +84,7 @@ public class EthernetManager {
		* Applications will almost always want to use
		* {@link android.content.Context#getSystemService Context.getSystemService()} to retrieve
		* the standard {@link android.content.Context#ETHERNET_SERVICE Context.ETHERNET_SERVICE}.
		* @hide
		*/
		public EthernetManager(Context context, IEthernetManager service) {
		mContext = context;
		@@ -87,6 +94,7 @@ public class EthernetManager {
		/**
		* Get Ethernet configuration.
		* @return the Ethernet Configuration, contained in {@link IpConfiguration}.
		* @hide
		*/
		@UnsupportedAppUsage
		public IpConfiguration getConfiguration(String iface) {
		@@ -99,6 +107,7 @@ public class EthernetManager {

		/**
		* Set Ethernet configuration.
		* @hide
		*/
		@UnsupportedAppUsage
		public void setConfiguration(String iface, IpConfiguration config) {
		@@ -111,6 +120,7 @@ public class EthernetManager {

		/**
		* Indicates whether the system currently has one or more Ethernet interfaces.
		* @hide
		*/
		@UnsupportedAppUsage
		public boolean isAvailable() {
		@@ -121,6 +131,7 @@ public class EthernetManager {
		* Indicates whether the system has given interface.
		*
		* @param iface Ethernet interface name
		* @hide
		*/
		@UnsupportedAppUsage
		public boolean isAvailable(String iface) {
		@@ -135,6 +146,7 @@ public class EthernetManager {
		* Adds a listener.
		* @param listener A {@link Listener} to add.
		* @throws IllegalArgumentException If the listener is null.
		* @hide
		*/
		@UnsupportedAppUsage
		public void addListener(Listener listener) {
		@@ -153,6 +165,7 @@ public class EthernetManager {

		/**
		* Returns an array of available Ethernet interface names.
		* @hide
		*/
		@UnsupportedAppUsage
		public String[] getAvailableInterfaces() {
		@@ -167,6 +180,7 @@ public class EthernetManager {
		* Removes a listener.
		* @param listener A {@link Listener} to remove.
		* @throws IllegalArgumentException If the listener is null.
		* @hide
		*/
		@UnsupportedAppUsage
		public void removeListener(Listener listener) {

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -136,6 +136,12 @@ public class TetheringManager {
		*/
		public static final int TETHERING_NCM = 4;

		/**
		* Ethernet tethering type.
		* @see #startTethering(TetheringRequest, Executor, StartTetheringCallback)
		*/
		public static final int TETHERING_ETHERNET = 5;

		public static final int TETHER_ERROR_NO_ERROR = 0;
		public static final int TETHER_ERROR_UNKNOWN_IFACE = 1;
		public static final int TETHER_ERROR_SERVICE_UNAVAIL = 2;