Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae3db6a1 authored by Amit Mahajan's avatar Amit Mahajan Committed by Gerrit Code Review
Browse files

Merge "Fix wrong SIM application type"

parents e6e6fe9e 4d028c78

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

+6 −0
Original line number Diff line number Diff line
@@ -136,6 +136,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;
@@ -325,6 +326,7 @@ public class UiccProfile extends IccCard { 
            }

            mCatService = null;

            mUiccApplications = null;

            mRadioTech = ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN;

            mCarrierPrivilegeRules = null;

            mContext.getContentResolver().unregisterContentObserver(

                    mProvisionCompleteContentObserver);
@@ -341,6 +343,7 @@ public class UiccProfile extends IccCard { 
            if (DBG) {

                log("Setting radio tech " + ServiceState.rilRadioTechnologyToString(radioTech));

            }

            mRadioTech = radioTech;

            setCurrentAppType(ServiceState.isGsm(radioTech));

            updateIccAvailability(false);

        }
@@ -1054,6 +1057,9 @@ public class UiccProfile extends IccCard { 
            }



            sanitizeApplicationIndexesLocked();

            if (mRadioTech != ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN) {

                setCurrentAppType(ServiceState.isGsm(mRadioTech));

            }

            updateIccAvailability(true);

        }

    }