Merge "Prefer default Internet network for upstream tethering."
This commit is contained in:
@@ -868,6 +868,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(),
|
||||||
@@ -885,7 +889,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) {
|
||||||
|
|||||||
Reference in New Issue
Block a user