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

Merge "Prefer default Internet network for upstream tethering." into pi-dev

Browse Source 
am: 1e1635a45e

Change-Id: I9cddf1fb7aa3b8d56bf048c563556244e74808c2
This commit is contained in:
Erik Kline
2018-06-20 01:14:14 -07:00
committed by android-build-merger
parent b8702350ac 359d4c6d61
commit 87c60852fd
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -898,6 +898,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
public boolean isTetheringSupported() { public boolean isTetheringSupported() {
return ConnectivityService.this.isTetheringSupported(); return ConnectivityService.this.isTetheringSupported();
} }
@Override
public NetworkRequest getDefaultNetworkRequest() {
return mDefaultRequest;
}
}; };
return new Tethering(mContext, mNetd, mStatsService, mPolicyManager, return new Tethering(mContext, mNetd, mStatsService, mPolicyManager,
IoThread.get().getLooper(), new MockableSystemProperties(), IoThread.get().getLooper(), new MockableSystemProperties(),
@@ -915,7 +919,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
private NetworkRequest createDefaultInternetRequestForTransport( private NetworkRequest createDefaultInternetRequestForTransport(
int transportType, NetworkRequest.Type type) { int transportType, NetworkRequest.Type type) {
NetworkCapabilities netCap = new NetworkCapabilities(); final NetworkCapabilities netCap = new NetworkCapabilities();
netCap.addCapability(NET_CAPABILITY_INTERNET); netCap.addCapability(NET_CAPABILITY_INTERNET);
netCap.addCapability(NET_CAPABILITY_NOT_RESTRICTED); netCap.addCapability(NET_CAPABILITY_NOT_RESTRICTED);
if (transportType > -1) { if (transportType > -1) {