Merge "Fix bug that UiccSlot#isStateUnknown returns true in ABSENT state." into pi-dev (f3482497) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -179,8 +179,8 @@ public class UiccSlot extends Handler {
		// no card present in the slot now; dispose card and make mUiccCard null
		if (mUiccCard != null) {
		mUiccCard.dispose();
		nullifyUiccCard(false /* sim state is not unknown */);
		}
		nullifyUiccCard(false /* sim state is not unknown */);
		mLastRadioState = radioState;
		}

		@@ -193,7 +193,7 @@ public class UiccSlot extends Handler {
		}

		public boolean isStateUnknown() {
		return mStateIsUnknown;
		return (mCardState == null \|\| mCardState == CardState.CARDSTATE_ABSENT) && mStateIsUnknown;
		}

		private void checkIsEuiccSupported() {