Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Split chooseUpstreamType() into two separate functions" am: 7a42d3ad83 am: f6d55d7e9e

Browse Source 
am: 8eb1fbf1bc

Change-Id: Ia8fd663404f1d0a70243ab9c9bd853ac6d51d68f
This commit is contained in:
Erik Kline
2017-02-15 01:04:44 +00:00
committed by android-build-merger
parent 0f5cf47489 8eb1fbf1bc
commit f51d562627
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/connectivity/Tethering.java
View File

@@ -1057,9 +1057,13 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
}
protected void chooseUpstreamType(boolean tryCell) {
final int upstreamType = findPreferredUpstreamType(tryCell);
setUpstreamByType(upstreamType);
}
protected int findPreferredUpstreamType(boolean tryCell) {
final ConnectivityManager cm = getConnectivityManager();
int upType = ConnectivityManager.TYPE_NONE;
String iface = null;
updateConfiguration(); // TODO - remove?
@@ -1117,7 +1121,13 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
break;
}
return upType;
}
protected void setUpstreamByType(int upType) {
final ConnectivityManager cm = getConnectivityManager();
Network network = null;
String iface = null;
if (upType != ConnectivityManager.TYPE_NONE) {
LinkProperties linkProperties = cm.getLinkProperties(upType);
if (linkProperties != null) {