summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-10-28 03:02:30 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-10-28 03:02:30 +0000
commit7ff1f35eac54be7ab971c3bc05687c17cdb07d76 (patch)
tree13296da2399e22cbee5f0a6e9d3e4b3844cac4fe
parent12202ff90cc999ad4850d741a104fada2a0a9c97 (diff)
parent4bdf675699cfa432a031fece91d51cbf4939aa72 (diff)
downloadethernet-7ff1f35eac54be7ab971c3bc05687c17cdb07d76.tar.gz
Snap for 5096429 from 4bdf675699cfa432a031fece91d51cbf4939aa72 to qt-release
Change-Id: Id1bd503c40a5205ddecab138a2c966f5c34dff96
-rw-r--r--java/com/android/server/ethernet/EthernetNetworkFactory.java5
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 + ", "