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

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

Fix dependencyMet issues regarding hipri APN. 

If the system says a dependency isn't met for accessing the default APN,
apps should not be able to turn on the hipri APN either.  This change
prevents apps from adjusting the dependencyMet setting on hipri and
internally ties its dependencyMet to that of the default APN.

bug:4643411
Change-Id: I7e609ff9bb1b85a3a6a41095052f0194d03be979
parent d3cc051d

telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

+8 −0
Original line number Diff line number Diff line
@@ -1535,6 +1535,9 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 


    @Override

    protected void onSetDependencyMet(String apnType, boolean met) {

        // don't allow users to tweak hipri to work around default dependency not met

        if (Phone.APN_TYPE_HIPRI.equals(apnType)) return;



        ApnContext apnContext = mApnContexts.get(apnType);

        if (apnContext == null) {

            loge("onSetDependencyMet: ApnContext not found in onSetDependencyMet(" +
@@ -1542,6 +1545,11 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
            return;

        }

        applyNewState(apnContext, apnContext.isEnabled(), met);

        if (Phone.APN_TYPE_DEFAULT.equals(apnType)) {

            // tie actions on default to similar actions on HIPRI regarding dependencyMet

            apnContext = mApnContexts.get(Phone.APN_TYPE_HIPRI);

            if (apnContext != null) applyNewState(apnContext, apnContext.isEnabled(), met);

        }

    }



    private void applyNewState(ApnContext apnContext, boolean enabled, boolean met) {