commit 786abd27cbebc962d0bd81a458b312d596796867
author Chalard Jean <jchalard@google.com> Thu May 21 07:02:58 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 21 07:02:58 2020 +0000
tree 790ed8d8d9364c526f7925919576453f5973ed29
parent 962ae21798586b8896349032350ae87104947e57
parent 5254e08e73957f1f575425d7946b362ab26814dd

Add capability they should always have to eth networks. am: 2bdb206bc0 am: 5254e08e73

Change-Id: Ic4ee8c8eb69754f4aebba6ac0e5b7f447e68a0c1

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

diff --git a/service-t/src/com/android/server/ethernet/EthernetTracker.java b/service-t/src/com/android/server/ethernet/EthernetTracker.java
index c8c3bdf..d37e0c9 100644
--- a/service-t/src/com/android/server/ethernet/EthernetTracker.java
+++ b/service-t/src/com/android/server/ethernet/EthernetTracker.java
@@ -464,6 +464,7 @@
         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 @@
                 }
             }
         }
+        // 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;
     }