Merge "Broadcast icc card state as NOT_READY if card is not initialized" into m-wireless-dev (72a3740d) · Commits · e / os / android_frameworks_opt_telephony

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

+9 −2

Original line number	Diff line number	Diff line
		@@ -362,7 +362,6 @@ public class IccCardProxy extends Handler implements IccCard {
		mIccRecords = newRecords;
		registerUiccCardEvents();
		}

		updateExternalState();
		}
		}
		@@ -382,7 +381,15 @@ public class IccCardProxy extends Handler implements IccCard {
		}

		private void updateExternalState() {
		if (mUiccCard == null \|\| mUiccCard.getCardState() == CardState.CARDSTATE_ABSENT) {

		// mUiccCard could be null at bootup, before valid card states have
		// been received from UiccController.
		if (mUiccCard == null) {
		setExternalState(State.NOT_READY);
		return;
		}

		if (mUiccCard.getCardState() == CardState.CARDSTATE_ABSENT) {
		if (mRadioOn) {
		setExternalState(State.ABSENT);
		} else {