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

Commit 1e92b658 authored by Amit Mahajan's avatar Amit Mahajan Committed by Automerger Merge Worker
Browse files

Merge "Fix wrong SIM application type" am: ae3db6a1 am: 02da01ea 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1371696

Change-Id: I2df611f07a18711ce8ccc84bb2380b932a193760
parents f375a9d8 02da01ea

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);

        }

    }