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

Commit 859bf0f2 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am 81433a38: Merge "Temp disable Tethering if DUN is required" into ics-mr0 

* commit '81433a38':
  Temp disable Tethering if DUN is required
parents 1b15f7f1 81433a38

services/java/com/android/server/ConnectivityService.java

+6 −0
Original line number Diff line number Diff line
@@ -2450,6 +2450,12 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
        int defaultVal = (SystemProperties.get("ro.tether.denied").equals("true") ? 0 : 1);

        boolean tetherEnabledInSettings = (Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.TETHER_SUPPORTED, defaultVal) != 0);

        // Short term disabling of Tethering if DUN is required.

        // TODO - fix multi-connection tethering using policy-base routing

        int[] upstreamConnTypes = mTethering.getUpstreamIfaceTypes();

        for (int i : upstreamConnTypes) {

            if (i == ConnectivityManager.TYPE_MOBILE_DUN) return false;

        }

        return tetherEnabledInSettings && mTetheringConfigValid;

    }