Reset last known num uicc applications on sim reset. am: 252716d41b am: 6391524083 (53392a23) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/uicc/UiccController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1164,7 +1164,7 @@ public class UiccController extends Handler {
		}

		if (changed && resp.refreshResult == IccRefreshResponse.REFRESH_RESULT_RESET) {
		uiccCard.getUiccProfile().updateIccAvailability(true);
		uiccCard.getUiccProfile().onSimReset();
		// If there is any change on RESET, reset carrier config as well. From carrier config
		// perspective, this is treated the same as sim state unknown
		CarrierConfigManager configManager = (CarrierConfigManager)

+9 −1

Original line number	Diff line number	Diff line
		@@ -528,10 +528,18 @@ public class UiccProfile extends IccCard {
		}
		}

		/**
		* This function is called on SIM_REFRESH of type RESET
		*/
		public void onSimReset() {
		mLastReportedNumOfUiccApplications = 0;
		updateIccAvailability(true);
		}

		/**
		* ICC availability/state changed. Update corresponding fields and external state if needed.
		*/
		public void updateIccAvailability(boolean allAppsChanged) {
		private void updateIccAvailability(boolean allAppsChanged) {
		synchronized (mLock) {
		UiccCardApplication newApp;
		IccRecords newRecords = null;

+2 −2

Original line number	Diff line number	Diff line
		@@ -651,7 +651,7 @@ public class UiccControllerTest extends TelephonyTest {
		mUiccControllerUT.handleMessage(msg);
		processAllMessages();

		// verify that updateIccAvailability() is called on refresh with RESET
		verify(mMockProfile).updateIccAvailability(true);
		// verify that onSimReset() is called on refresh with RESET
		verify(mMockProfile).onSimReset();
		}
		}