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

Merge "Slightly simplify mTryCell and requestUpstreamMobileConnection() usage" am: 63445824d6 am: 4650762557

Browse Source 
am: 23d077318c

Change-Id: I19f92ac6160702233832a190aeeaeff06391ce9e
This commit is contained in:
Erik Kline
2017-02-15 01:03:49 +00:00
committed by android-build-merger
parent fa030e505d 23d077318c
commit 0f5cf47489
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1008,10 +1008,9 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
return false;
}
protected boolean requestUpstreamMobileConnection() {
protected void requestUpstreamMobileConnection() {
mUpstreamNetworkMonitor.updateMobileRequiresDun(mConfig.isDunRequired);
mUpstreamNetworkMonitor.registerMobileNetworkRequest();
return true;
}
protected void unrequestUpstreamMobileConnection() {
@@ -1100,7 +1099,8 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
requestUpstreamMobileConnection();
break;
case ConnectivityManager.TYPE_NONE:
if (tryCell && requestUpstreamMobileConnection()) {
if (tryCell) {
requestUpstreamMobileConnection();
// We think mobile should be coming up; don't set a retry.
} else {
sendMessageDelayed(CMD_RETRY_UPSTREAM, UPSTREAM_SETTLE_TIME_MS);
@@ -1354,9 +1354,9 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
simChange.startListening();
mUpstreamNetworkMonitor.start();
mTryCell = true; // better try something first pass or crazy tests cases will fail
chooseUpstreamType(mTryCell);
mTryCell = !mTryCell;
// Better try something first pass or crazy tests cases will fail.
chooseUpstreamType(true);
mTryCell = false;
}
@Override
@@ -1407,10 +1407,9 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
break;
}
case CMD_UPSTREAM_CHANGED:
// need to try DUN immediately if Wifi goes down
mTryCell = true;
chooseUpstreamType(mTryCell);
mTryCell = !mTryCell;
// Need to try DUN immediately if Wi-Fi goes down.
chooseUpstreamType(true);
mTryCell = false;
break;
case CMD_RETRY_UPSTREAM:
chooseUpstreamType(mTryCell);