Merge changes Iafa8979d,I44eac159,I27ad3298 am: 6097358382 am: ec84e33d10

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2042596

Change-Id: I8f6867128057d092e916515049078c1d68b427a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -541,8 +541,7 @@ public class EthernetManager {
      * Similarly, use {@link NetworkCapabilities.Builder} to build a {@code NetworkCapabilities}
      * object for this network to put inside the {@code request}.
      *
-     * This function accepts an {@link OutcomeReceiver} that is called once the operation has
+     * The provided {@link OutcomeReceiver} is called once the operation has finished execution.
-     * finished execution.
      *
      * @param iface the name of the interface to act upon.
      * @param request the {@link EthernetNetworkUpdateRequest} used to set an ethernet network's
@@ -554,7 +553,8 @@ public class EthernetManager {
      *                 information about the error.
      * @throws SecurityException if the process doesn't hold
      *                          {@link android.Manifest.permission.MANAGE_ETHERNET_NETWORKS}.
-     * @throws UnsupportedOperationException if called on a non-automotive device or on an
+     * @throws UnsupportedOperationException if the {@link NetworkCapabilities} are updated on a
+     *                                       non-automotive device or this function is called on an
      *                                       unsupported interface.
      * @hide
      */
@@ -582,9 +582,9 @@ public class EthernetManager {
     /**
      * Enable a network interface.
      *
-     * Enables a previously disabled network interface.
+     * Enables a previously disabled network interface. An attempt to enable an already-enabled
-     * This function accepts an {@link OutcomeReceiver} that is called once the operation has
+     * interface is ignored.
-     * finished execution.
+     * The provided {@link OutcomeReceiver} is called once the operation has finished execution.
      *
      * @param iface the name of the interface to enable.
      * @param executor an {@link Executor} to execute the callback on. Optional if callback is null.
@@ -619,10 +619,9 @@ public class EthernetManager {
     /**
      * Disable a network interface.
      *
-     * Disables the use of a network interface to fulfill network requests. If the interface
+     * Disables the specified interface. If this interface is in use in a connected
-     * currently serves a request, the network will be torn down.
+     * {@link android.net.Network}, then that {@code Network} will be torn down.
-     * This function accepts an {@link OutcomeReceiver} that is called once the operation has
+     * The provided {@link OutcomeReceiver} is called once the operation has finished execution.
-     * finished execution.
      *
      * @param iface the name of the interface to disable.
      * @param executor an {@link Executor} to execute the callback on. Optional if callback is null.

service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java

@@ -23,14 +23,13 @@ import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.net.ConnectivityResources;
 import android.net.EthernetManager;
-import android.net.EthernetNetworkSpecifier;
 import android.net.EthernetNetworkManagementException;
+import android.net.EthernetNetworkSpecifier;
 import android.net.INetworkInterfaceOutcomeReceiver;
 import android.net.IpConfiguration;
 import android.net.IpConfiguration.IpAssignment;
 import android.net.IpConfiguration.ProxySettings;
 import android.net.LinkProperties;
-import android.net.Network;
 import android.net.NetworkAgentConfig;
 import android.net.NetworkCapabilities;
 import android.net.NetworkFactory;