Merge "Fix ethernet enable / disable API" (5099eb16) · Commits · e / os / android_frameworks_base

packages/ConnectivityT/framework-t/src/android/net/EthernetManager.java

+13 −16

Original line number	Original line	Diff line number	Diff line
	@@ -579,14 +579,13 @@ public class EthernetManager {
	}		}

	/**		/**
	* Set an ethernet network's link state up.		* Enable a network interface.
	*		*
	* When the link is successfully turned up, the callback will be called with the network		* Enables a previously disabled network interface.
	* interface was torn down, if any. If any error or unexpected condition happens while the		* This function accepts an {@link OutcomeReceiver} that is called once the operation has
	* system tries to turn the interface down, the callback will be called with an appropriate		* finished execution.
	* exception. The callback is guaranteed to be called exactly once for each call to this method.
	*		*
	* @param iface the name of the interface to act upon.		* @param iface the name of the interface to enable.
	* @param executor an {@link Executor} to execute the callback on. Optional if callback is null.		* @param executor an {@link Executor} to execute the callback on. Optional if callback is null.
	* @param callback an optional {@link OutcomeReceiver} to listen for completion of the		* @param callback an optional {@link OutcomeReceiver} to listen for completion of the
	* operation. On success, {@link OutcomeReceiver#onResult} is called with the		* operation. On success, {@link OutcomeReceiver#onResult} is called with the
	@@ -594,7 +593,6 @@ public class EthernetManager {
	* information about the error.		* information about the error.
	* @throws SecurityException if the process doesn't hold		* @throws SecurityException if the process doesn't hold
	* {@link android.Manifest.permission.MANAGE_ETHERNET_NETWORKS}.		* {@link android.Manifest.permission.MANAGE_ETHERNET_NETWORKS}.
	* @throws UnsupportedOperationException if called on a non-automotive device.
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	@@ -603,7 +601,7 @@ public class EthernetManager {
	android.Manifest.permission.NETWORK_STACK,		android.Manifest.permission.NETWORK_STACK,
	android.Manifest.permission.MANAGE_ETHERNET_NETWORKS})		android.Manifest.permission.MANAGE_ETHERNET_NETWORKS})
	@RequiresFeature(PackageManager.FEATURE_AUTOMOTIVE)		@RequiresFeature(PackageManager.FEATURE_AUTOMOTIVE)
	public void connectNetwork(		public void enableInterface(
	@NonNull String iface,		@NonNull String iface,
	@Nullable @CallbackExecutor Executor executor,		@Nullable @CallbackExecutor Executor executor,
	@Nullable OutcomeReceiver<String, EthernetNetworkManagementException> callback) {		@Nullable OutcomeReceiver<String, EthernetNetworkManagementException> callback) {
	@@ -618,14 +616,14 @@ public class EthernetManager {
	}		}

	/**		/**
	* Set an ethernet network's link state down.		* Disable a network interface.
	*		*
	* When the link is successfully turned down, the callback will be called with the network		* Disables the use of a network interface to fulfill network requests. If the interface
	* interface was torn down, if any. If any error or unexpected condition happens while the		* currently serves a request, the network will be torn down.
	* system tries to turn the interface down, the callback will be called with an appropriate		* This function accepts an {@link OutcomeReceiver} that is called once the operation has
	* exception. The callback is guaranteed to be called exactly once for each call to this method.		* finished execution.
	*		*
	* @param iface the name of the interface to act upon.		* @param iface the name of the interface to disable.
	* @param executor an {@link Executor} to execute the callback on. Optional if callback is null.		* @param executor an {@link Executor} to execute the callback on. Optional if callback is null.
	* @param callback an optional {@link OutcomeReceiver} to listen for completion of the		* @param callback an optional {@link OutcomeReceiver} to listen for completion of the
	* operation. On success, {@link OutcomeReceiver#onResult} is called with the		* operation. On success, {@link OutcomeReceiver#onResult} is called with the
	@@ -633,7 +631,6 @@ public class EthernetManager {
	* information about the error.		* information about the error.
	* @throws SecurityException if the process doesn't hold		* @throws SecurityException if the process doesn't hold
	* {@link android.Manifest.permission.MANAGE_ETHERNET_NETWORKS}.		* {@link android.Manifest.permission.MANAGE_ETHERNET_NETWORKS}.
	* @throws UnsupportedOperationException if called on a non-automotive device.
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	@@ -642,7 +639,7 @@ public class EthernetManager {
	android.Manifest.permission.NETWORK_STACK,		android.Manifest.permission.NETWORK_STACK,
	android.Manifest.permission.MANAGE_ETHERNET_NETWORKS})		android.Manifest.permission.MANAGE_ETHERNET_NETWORKS})
	@RequiresFeature(PackageManager.FEATURE_AUTOMOTIVE)		@RequiresFeature(PackageManager.FEATURE_AUTOMOTIVE)
	public void disconnectNetwork(		public void disableInterface(
	@NonNull String iface,		@NonNull String iface,
	@Nullable @CallbackExecutor Executor executor,		@Nullable @CallbackExecutor Executor executor,
	@Nullable OutcomeReceiver<String, EthernetNetworkManagementException> callback) {		@Nullable OutcomeReceiver<String, EthernetNetworkManagementException> callback) {