diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2018-10-26 00:47:42 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-10-26 00:47:42 -0700 |
| commit | 17b2aee34caff2d0d012457cfdb85dfb5b0e20f6 (patch) | |
| tree | 13296da2399e22cbee5f0a6e9d3e4b3844cac4fe | |
| parent | c5acc571cde40b84804685025319a378300d8549 (diff) | |
| parent | 8af1c3493fa8a855813a538135e274c97aa0a99b (diff) | |
| download | ethernet-17b2aee34caff2d0d012457cfdb85dfb5b0e20f6.tar.gz | |
Merge "Don't consider TRACK_DEFAULT requests in EthernetNetworkFactory."
am: 8af1c3493f
Change-Id: I0f3920549cba1b1bdb2f8cd0d7a0a0b5ec93897c
| -rw-r--r-- | java/com/android/server/ethernet/EthernetNetworkFactory.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/com/android/server/ethernet/EthernetNetworkFactory.java b/java/com/android/server/ethernet/EthernetNetworkFactory.java index dc94482..54bcdc3 100644 --- a/java/com/android/server/ethernet/EthernetNetworkFactory.java +++ b/java/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 + ", " |