diff options
| author | Chalard Jean <jchalard@google.com> | 2020-05-21 06:42:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-21 06:42:59 +0000 |
| commit | 974777ebec9df1b86ad2425c8aac57ec18c11bef (patch) | |
| tree | 8bbd73361c6c6d8b0a482e0f9fde6fd4ab0d5f21 | |
| parent | 410131611f003fca78976259936d5055188c1cbe (diff) | |
| parent | 8d810d8e61851b2dd6ed13b9514a8e12794c381a (diff) | |
| download | ethernet-974777ebec9df1b86ad2425c8aac57ec18c11bef.tar.gz | |
Add capability they should always have to eth networks. am: 8d810d8e61
Change-Id: Ic77506be229b5cd26d359530a45216516a421215
| -rw-r--r-- | java/com/android/server/ethernet/EthernetTracker.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/java/com/android/server/ethernet/EthernetTracker.java b/java/com/android/server/ethernet/EthernetTracker.java index c8c3bdf..d37e0c9 100644 --- a/java/com/android/server/ethernet/EthernetTracker.java +++ b/java/com/android/server/ethernet/EthernetTracker.java @@ -464,6 +464,7 @@ final class EthernetTracker { nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED); nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING); nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED); + nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED); 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; } |