LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Don't make an interface default if it has defined capabilities."

Browse Source
This commit is contained in:
Lorenzo Colitti
2022-06-17 06:34:34 +00:00
committed by Gerrit Code Review
parent ea95231d63 58a71dda5d
commit 81f162992e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}