Merge Android Pie into master

Bug: 112104996 Change-Id: If0792b50c7a65f6adb4a43a8a87130b7189d9b4d
2018-08-06 16:50:56 -07:00
parent a80cdd187b 264350ea3b
commit de5179113d
1 changed files with 1 additions and 0 deletions
--- a/service-t/src/com/android/server/ethernet/EthernetTracker.java
+++ b/service-t/src/com/android/server/ethernet/EthernetTracker.java
@@ -314,6 +314,7 @@ final class EthernetTracker {
        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);
        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);
        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING);
+        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED);

        return nc;
    }