Merge "Fix wrong SIM application type" am: ae3db6a137 am: 02da01eaba am:... (0d01228c) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -141,6 +141,7 @@ public class UiccProfile extends IccCard {

		@VisibleForTesting
		public int mCurrentAppType = UiccController.APP_FAM_3GPP; //default to 3gpp?
		private int mRadioTech = ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN;
		private UiccCardApplication mUiccApplication = null;
		private IccRecords mIccRecords = null;
		private IccCardConstants.State mExternalState = IccCardConstants.State.UNKNOWN;
		@@ -340,6 +341,7 @@ public class UiccProfile extends IccCard {
		}
		mCatService = null;
		mUiccApplications = null;
		mRadioTech = ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN;
		mCarrierPrivilegeRules = null;
		mContext.getContentResolver().unregisterContentObserver(
		mProvisionCompleteContentObserver);
		@@ -356,6 +358,7 @@ public class UiccProfile extends IccCard {
		if (DBG) {
		log("Setting radio tech " + ServiceState.rilRadioTechnologyToString(radioTech));
		}
		mRadioTech = radioTech;
		setCurrentAppType(ServiceState.isGsm(radioTech));
		updateIccAvailability(false);
		}
		@@ -1069,6 +1072,9 @@ public class UiccProfile extends IccCard {
		}

		sanitizeApplicationIndexesLocked();
		if (mRadioTech != ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN) {
		setCurrentAppType(ServiceState.isGsm(mRadioTech));
		}
		updateIccAvailability(true);
		}
		}