Merge "Don't consider TRACK_DEFAULT requests in EthernetNetworkFactory." am: ed99be7316
am: bc15b0a762
Change-Id: Ib911288c5a800e3d0f22b180a55d0c6339c8bc40
This commit is contained in:
@@ -72,6 +72,10 @@ public class EthernetNetworkFactory extends NetworkFactory {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean acceptRequest(NetworkRequest request, int score) {
|
public boolean acceptRequest(NetworkRequest request, int score) {
|
||||||
|
if (request.type == NetworkRequest.Type.TRACK_DEFAULT) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (DBG) {
|
if (DBG) {
|
||||||
Log.d(TAG, "acceptRequest, request: " + request + ", score: " + score);
|
Log.d(TAG, "acceptRequest, request: " + request + ", score: " + score);
|
||||||
}
|
}
|
||||||
@@ -424,6 +428,7 @@ public class EthernetNetworkFactory extends NetworkFactory {
|
|||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return getClass().getSimpleName() + "{ "
|
return getClass().getSimpleName() + "{ "
|
||||||
|
+ "refCount: " + refCount + ", "
|
||||||
+ "iface: " + name + ", "
|
+ "iface: " + name + ", "
|
||||||
+ "up: " + mLinkUp + ", "
|
+ "up: " + mLinkUp + ", "
|
||||||
+ "hwAddress: " + mHwAddress + ", "
|
+ "hwAddress: " + mHwAddress + ", "
|
||||||
|
|||||||
Reference in New Issue
Block a user