Removed setDependencyMet in ApnContext am: dc1655143a (c923ade3) · Commits · e / os / android_frameworks_opt_telephony

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
		@@ -1395,7 +1395,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);
		@@ -2117,12 +2117,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);

		@@ -2186,7 +2187,6 @@ public class DcTracker extends Handler {
		}
		}
		apnContext.setEnabled(enabled);
		apnContext.setDependencyMet(met);
		if (cleanup) cleanUpConnectionInternal(true, apnContext);
		if (trySetup) {
		apnContext.resetErrorCodeRetries();
		@@ -2284,7 +2284,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
		@@ -940,7 +940,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));
		}