LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't consider TRACK_DEFAULT requests in EthernetNetworkFactory.

Browse Source 
These should not affect network refcount and thus should not be
passed to the network transport.

Bug: 116034205
Test: successfully established a VPN when connected to USB ethernet
Change-Id: I66517d86f35b8cfc1e211cb189127187d2744b60
This commit is contained in:
Lorenzo Colitti
2018-10-16 17:36:40 +09:00
parent 33893d68d4
commit 4f316a4420
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
View File

@@ -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 + ", "