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

Commit c9dac118 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Don't forget to turn off mobile_dun 

When we find a higher priority match for tethering traffic we should turn off
whatever we were trying before.

bug:6083611
Change-Id: I06ee41336df107353bf1a979150345e461574a48
parent d9f94416

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

+10 −0
Original line number Diff line number Diff line
@@ -1215,6 +1215,8 @@ public class Tethering extends INetworkManagementEventObserver.Stub { 
                return retValue;

            }

            protected boolean turnOffUpstreamMobileConnection() {

                // ignore pending renewal requests

                ++mCurrentConnectionSequence;

                if (mMobileApnReserved != ConnectivityManager.TYPE_NONE) {

                    try {

                        mConnService.stopUsingNetworkFeature(ConnectivityManager.TYPE_MOBILE,
@@ -1304,6 +1306,14 @@ public class Tethering extends INetworkManagementEventObserver.Stub { 
                if (upType == ConnectivityManager.TYPE_MOBILE_DUN ||

                        upType == ConnectivityManager.TYPE_MOBILE_HIPRI) {

                    turnOnUpstreamMobileConnection(upType);

                } else if (upType != ConnectivityManager.TYPE_NONE) {

                    /* If we've found an active upstream connection that's not DUN/HIPRI

                     * we should stop any outstanding DUN/HIPRI start requests.

                     *

                     * If we found NONE we don't want to do this as we want any previous

                     * requests to keep trying to bring up something we can use.

                     */

                    turnOffUpstreamMobileConnection();

                }



                if (upType == ConnectivityManager.TYPE_NONE) {