Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb41343c authored by Erik Kline's avatar Erik Kline
Browse files

Slightly simplify mTryCell and requestUpstreamMobileConnection() usage 

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131

Change-Id: I46fbd176a71e61552d7d92660c1debe6487a1edf
parent ed6d75d5

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

+9 −10
Original line number Diff line number Diff line
@@ -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);
@@ -1359,9 +1359,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
@@ -1412,10 +1412,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);