commit cfa9c5b495da831fd9badf10a92e26b6e95ba1d8
author Erik Kline <ek@google.com> Wed Feb 15 01:11:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 15 01:11:30 2017 +0000
tree efe5539ddfb80fa042cb3f796bd6b0a948f31900
parent aada49a3972b65354beb5153e440ad4465552c72
parent f51d562627aa799b7222efcf07c61e301dfa22be

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

Change-Id: Id2e6f20d79f088d27593953ec39112a84a8ba5f0

services/core/java/com/android/server/connectivity/Tethering.java

diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java
index 89e5b4c..6c608a2 100644
--- a/services/core/java/com/android/server/connectivity/Tethering.java
+++ b/services/core/java/com/android/server/connectivity/Tethering.java
@@ -1057,9 +1057,13 @@
             }
 
             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 @@
                         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) {