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

Commit afc662dc authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Make LOADED an external sim state." 

am: 87405c38

Change-Id: Ia3ded155de9e1e572f2e75fdc7f5b6b31d3f93c5
parents 8e35d1bb 87405c38

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

+3 −7
Original line number Diff line number Diff line
@@ -228,9 +228,7 @@ public class IccCardProxy extends Handler implements IccCard { 
                    mUiccCard.registerForCarrierPrivilegeRulesLoaded(

                            this, EVENT_CARRIER_PRIVILEGES_LOADED, null);

                } else {

                    broadcastInternalIccStateChangedIntent(IccCardConstants.INTENT_VALUE_ICC_LOADED,

                            null);

                    //setExternalState(State.LOADED);

                    setExternalState(State.LOADED);

                }

                break;

            case EVENT_IMSI_READY:
@@ -257,9 +255,7 @@ public class IccCardProxy extends Handler implements IccCard { 
                if (mUiccCard != null) {

                    mUiccCard.unregisterForCarrierPrivilegeRulesLoaded(this);

                }

                broadcastInternalIccStateChangedIntent(IccCardConstants.INTENT_VALUE_ICC_LOADED,

                        null);

                //setExternalState(State.LOADED);

                setExternalState(State.LOADED);

                break;



            default:
@@ -512,7 +508,7 @@ public class IccCardProxy extends Handler implements IccCard { 
            case PERM_DISABLED: return IccCardConstants.INTENT_VALUE_ICC_LOCKED;

            case CARD_IO_ERROR: return IccCardConstants.INTENT_VALUE_ICC_CARD_IO_ERROR;

            case CARD_RESTRICTED: return IccCardConstants.INTENT_VALUE_ICC_CARD_RESTRICTED;

            //case LOADED: return IccCardConstants.INTENT_VALUE_ICC_LOADED;

            case LOADED: return IccCardConstants.INTENT_VALUE_ICC_LOADED;

            default: return IccCardConstants.INTENT_VALUE_ICC_UNKNOWN;

        }

    }

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

+3 −7
Original line number Diff line number Diff line
@@ -268,9 +268,7 @@ public class UiccProfile extends Handler implements IccCard { 
                    mUiccCard.registerForCarrierPrivilegeRulesLoaded(

                            this, EVENT_CARRIER_PRIVILEGES_LOADED, null);

                } else {

                    broadcastInternalIccStateChangedIntent(IccCardConstants.INTENT_VALUE_ICC_LOADED,

                            null);

                    //setExternalState(State.LOADED);

                    setExternalState(IccCardConstants.State.LOADED);

                }

                break;
@@ -295,9 +293,7 @@ public class UiccProfile extends Handler implements IccCard { 
                if (mUiccCard != null) {

                    mUiccCard.unregisterForCarrierPrivilegeRulesLoaded(this);

                }

                broadcastInternalIccStateChangedIntent(IccCardConstants.INTENT_VALUE_ICC_LOADED,

                        null);

                //setExternalState(State.LOADED);

                setExternalState(IccCardConstants.State.LOADED);

                break;



            default:
@@ -512,7 +508,7 @@ public class UiccProfile extends Handler implements IccCard { 
            case PERM_DISABLED: return IccCardConstants.INTENT_VALUE_ICC_LOCKED;

            case CARD_IO_ERROR: return IccCardConstants.INTENT_VALUE_ICC_CARD_IO_ERROR;

            case CARD_RESTRICTED: return IccCardConstants.INTENT_VALUE_ICC_CARD_RESTRICTED;

            //case LOADED: return IccCardConstants.INTENT_VALUE_ICC_LOADED;

            case LOADED: return IccCardConstants.INTENT_VALUE_ICC_LOADED;

            default: return IccCardConstants.INTENT_VALUE_ICC_UNKNOWN;

        }

    }