Merge "Don't make an interface default if it has defined capabilities." am: 81f162992e

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

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

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

@@ -269,6 +269,8 @@ public class EthernetTracker {
                     + ", ipConfig: " + ipConfig);
         }
 
+        // TODO: do the right thing if the interface was in server mode: either fail this operation,
+        // or take the interface out of server mode.
         final IpConfiguration localIpConfig = ipConfig == null
                 ? null : new IpConfiguration(ipConfig);
         if (ipConfig != null) {
@@ -579,8 +581,8 @@ public class EthernetTracker {
         }
         if (DBG) Log.i(TAG, "maybeTrackInterface: " + iface);
 
-        // TODO: avoid making an interface default if it has configured NetworkCapabilities.
-        if (mDefaultInterface == null) {
+        // Do not make an interface default if it has configured NetworkCapabilities.
+        if (mDefaultInterface == null && !mNetworkCapabilities.containsKey(iface)) {
             mDefaultInterface = iface;
         }