Add capability they should always have to eth networks. am: bddcfc0c48 am: debefd4ab9

Change-Id: Ibf5289c7b4fb6c0e2d65bf9dbadaa2fac9cd1407
This commit is contained in:
Chalard Jean
2020-05-11 12:31:01 +00:00
committed by Automerger Merge Worker

View File

@@ -464,6 +464,7 @@ final class EthernetTracker {
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED); nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING); nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING);
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED); nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED);
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED);
return nc; return nc;
} }
@@ -542,6 +543,11 @@ final class EthernetTracker {
} }
} }
} }
// Ethernet networks have no way to update the following capabilities, so they always
// have them.
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING);
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED);
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED);
return nc; return nc;
} }