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

Commit dc165514 authored by Jack Yu's avatar Jack Yu
Browse files

Removed setDependencyMet in ApnContext 

The dependency met is a static configuration from resource.
There is no need to have a set method for that.

Test: Telephony sanity tests + unit tests
Bug: 73659459

Merged-In: Iddd2c30f35d776ca6098c12d61842da60ddac014
Change-Id: Iddd2c30f35d776ca6098c12d61842da60ddac014
(cherry picked from commit b7d1a3ac)
parent 3cf02b61

src/java/com/android/internal/telephony/dataconnection/ApnContext.java

+1 −8
Original line number Diff line number Diff line
@@ -385,14 +385,7 @@ public class ApnContext { 
        return mDataEnabled.get();

    }



    public void setDependencyMet(boolean met) {

        if (DBG) {

            log("set mDependencyMet as " + met + " current state is " + mDependencyMet.get());

        }

        mDependencyMet.set(met);

    }



    public boolean getDependencyMet() {

    public boolean isDependencyMet() {

       return mDependencyMet.get();

    }

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+7 −7
Original line number Diff line number Diff line
@@ -1394,7 +1394,7 @@ public class DcTracker extends Handler { 
            str.append("trySetupData failed. apnContext = [type=" + apnContext.getApnType()

                    + ", mState=" + apnContext.getState() + ", apnEnabled="

                    + apnContext.isEnabled() + ", mDependencyMet="

                    + apnContext.getDependencyMet() + "] ");

                    + apnContext.isDependencyMet() + "] ");



            if (!mDataEnabledSettings.isDataEnabled()) {

                str.append("isDataEnabled() = false. " + mDataEnabledSettings);
@@ -2116,12 +2116,13 @@ public class DcTracker extends Handler { 
        setDataProfilesAsNeeded();

    }



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

    private void applyNewState(ApnContext apnContext, boolean enabled) {

        boolean cleanup = false;

        boolean trySetup = false;

        String str ="applyNewState(" + apnContext.getApnType() + ", " + enabled +

                "(" + apnContext.isEnabled() + "), " + met + "(" +

                apnContext.getDependencyMet() +"))";

        boolean met = apnContext.isDependencyMet();

        String str = "applyNewState(" + apnContext.getApnType() + ", " + enabled

                + "(" + apnContext.isEnabled() + "), " + met + "("

                + apnContext.isDependencyMet() + "))";

        if (DBG) log(str);

        apnContext.requestLog(str);
@@ -2185,7 +2186,6 @@ public class DcTracker extends Handler { 
            }

        }

        apnContext.setEnabled(enabled);

        apnContext.setDependencyMet(met);

        if (cleanup) cleanUpConnectionInternal(true, apnContext);

        if (trySetup) {

            apnContext.resetErrorCodeRetries();
@@ -2283,7 +2283,7 @@ public class DcTracker extends Handler { 
        }

        // TODO change our retry manager to use the appropriate numbers for the new APN

        if (DBG) log("onEnableApn: apnContext=" + apnContext + " call applyNewState");

        applyNewState(apnContext, enabled == DctConstants.ENABLED, apnContext.getDependencyMet());

        applyNewState(apnContext, enabled == DctConstants.ENABLED);



        if ((enabled == DctConstants.DISABLED) &&

            isOnlySingleDcAllowed(mPhone.getServiceState().getRilDataRadioTechnology()) &&

tests/telephonytests/src/com/android/internal/telephony/dataconnection/ApnContextTest.java

+0 −16
Original line number Diff line number Diff line
@@ -85,14 +85,6 @@ public class ApnContextTest extends TelephonyTest { 
        }

    }



    @Test

    @SmallTest

    public void testDependencyMet() throws Exception {

        assertTrue(mApnContext.getDependencyMet());

        mApnContext.setDependencyMet(false);

        assertFalse(mApnContext.getDependencyMet());

    }



    @Test

    @SmallTest

    public void testReason() throws Exception {
@@ -108,7 +100,6 @@ public class ApnContextTest extends TelephonyTest { 
        mApnContext.setState(DctConstants.State.DISCONNECTING);

        assertEquals(DctConstants.State.DISCONNECTING, mApnContext.getState());

        mApnContext.setEnabled(true);

        mApnContext.setDependencyMet(true);

        assertFalse(mApnContext.isConnectable());



        mApnContext.setState(DctConstants.State.RETRYING);
@@ -198,17 +189,10 @@ public class ApnContextTest extends TelephonyTest { 
    @SmallTest

    public void testIsReady() throws Exception {

        mApnContext.setEnabled(true);

        mApnContext.setDependencyMet(true);

        assertTrue(mApnContext.isReady());



        mApnContext.setEnabled(false);

        assertFalse(mApnContext.isReady());



        mApnContext.setDependencyMet(false);

        assertFalse(mApnContext.isReady());



        mApnContext.setEnabled(true);

        assertFalse(mApnContext.isReady());

    }



    @Test

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ public class DcTrackerTest extends TelephonyTest { 
        doReturn(apnSetting).when(mApnContext).getApnSetting();

        doReturn(mDataConnection).when(mApnContext).getDataConnection();

        doReturn(true).when(mApnContext).isEnabled();

        doReturn(true).when(mApnContext).getDependencyMet();

        doReturn(true).when(mApnContext).isDependencyMet();

        doReturn(true).when(mApnContext).isReady();

        doReturn(false).when(mApnContext).hasRestrictedRequests(eq(true));

    }