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

Merge "Split chooseUpstreamType() into two separate functions"

Browse Source
This commit is contained in:
Erik Kline
2017-02-15 00:38:50 +00:00
committed by Gerrit Code Review
parent 63445824d6 14f7faf78e
commit 7a42d3ad83
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) { protected void chooseUpstreamType(boolean tryCell) {
final int upstreamType = findPreferredUpstreamType(tryCell);
setUpstreamByType(upstreamType);
}
protected int findPreferredUpstreamType(boolean tryCell) {
final ConnectivityManager cm = getConnectivityManager(); final ConnectivityManager cm = getConnectivityManager();
int upType = ConnectivityManager.TYPE_NONE; int upType = ConnectivityManager.TYPE_NONE;
String iface = null;
updateConfiguration(); // TODO - remove? updateConfiguration(); // TODO - remove?
@@ -1117,7 +1121,13 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
break; break;
} }
return upType;
}
protected void setUpstreamByType(int upType) {
final ConnectivityManager cm = getConnectivityManager();
Network network = null; Network network = null;
String iface = null;
if (upType != ConnectivityManager.TYPE_NONE) { if (upType != ConnectivityManager.TYPE_NONE) {
LinkProperties linkProperties = cm.getLinkProperties(upType); LinkProperties linkProperties = cm.getLinkProperties(upType);
if (linkProperties != null) { if (linkProperties != null) {