Merge "Don't consider TRACK_DEFAULT requests in EthernetNetworkFactory." am: ed99be7316 am: bc15b0a762

am: c05e7f186b Change-Id: Id19fae76ab3b1633d1be1140f1d66708c09caa4e
2018-10-26 00:57:46 -07:00
parent da9da4b277 c05e7f186b
commit 84c5bd7901
1 changed files with 5 additions and 0 deletions
--- a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -72,6 +72,10 @@ public class EthernetNetworkFactory extends NetworkFactory {

    @Override
    public boolean acceptRequest(NetworkRequest request, int score) {
+        if (request.type == NetworkRequest.Type.TRACK_DEFAULT) {
+            return false;
+        }
+
        if (DBG) {
            Log.d(TAG, "acceptRequest, request: " + request + ", score: " + score);
        }
@@ -424,6 +428,7 @@ public class EthernetNetworkFactory extends NetworkFactory {
        @Override
        public String toString() {
            return getClass().getSimpleName() + "{ "
+                    + "refCount: " + refCount + ", "
                    + "iface: " + name + ", "
                    + "up: " + mLinkUp + ", "
                    + "hwAddress: " + mHwAddress + ", "