Merge "Reset throttling timer when sim loaded" into sc-dev (ce516b37) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -2547,6 +2547,7 @@ public class DcTracker extends Handler {
		if (mSimState == TelephonyManager.SIM_STATE_ABSENT) {
		onSimAbsent();
		} else if (mSimState == TelephonyManager.SIM_STATE_LOADED) {
		mDataThrottler.reset();
		if (mConfigReady) {
		createAllApnList();
		setDataProfilesAsNeeded();

+14 −1

Original line number	Diff line number	Diff line
		@@ -2907,7 +2907,20 @@ public class DcTrackerTest extends TelephonyTest {
		waitForLastHandlerAction(mDcTrackerTestHandler.getThreadHandler());

		// Verify unthrottling
		verify(mDataThrottler).reset();
		verify(mDataThrottler, times(2)).reset();
		}

		@Test
		public void testDataUnthrottledOnSimStateChanged() throws Exception {
		initApns(ApnSetting.TYPE_IMS_STRING, new String[]{ApnSetting.TYPE_IMS_STRING});
		replaceInstance(DcTracker.class, "mDataThrottler", mDct, mDataThrottler);

		mDct.enableApn(ApnSetting.TYPE_IMS, DcTracker.REQUEST_TYPE_NORMAL, null);
		sendInitializationEvents();
		sendSimStateUpdated("testDataUnthrottledOnSimStateChanged");

		// Verify unthrottling
		verify(mDataThrottler, times(2)).reset();
		}

		@Test