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

Commit 96435130 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Copy over logic from IccCardProxy to UiccProfile."

parents f768bb9c 4a7b0a1d

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

+0 −23
Original line number Diff line number Diff line
@@ -82,8 +82,6 @@ public class IccCardProxy extends Handler implements IccCard { 
    private static final int EVENT_NETWORK_LOCKED = 9;



    private static final int EVENT_ICC_RECORD_EVENTS = 500;

    private static final int EVENT_SUBSCRIPTION_ACTIVATED = 501;

    private static final int EVENT_SUBSCRIPTION_DEACTIVATED = 502;

    private static final int EVENT_CARRIER_PRIVILEGES_LOADED = 503;



    private Integer mPhoneId = null;
@@ -242,16 +240,6 @@ public class IccCardProxy extends Handler implements IccCard { 
                mNetworkLockedRegistrants.notifyRegistrants();

                setExternalState(State.NETWORK_LOCKED);

                break;

            case EVENT_SUBSCRIPTION_ACTIVATED:

                log("EVENT_SUBSCRIPTION_ACTIVATED");

                onSubscriptionActivated();

                break;



            case EVENT_SUBSCRIPTION_DEACTIVATED:

                log("EVENT_SUBSCRIPTION_DEACTIVATED");

                onSubscriptionDeactivated();

                break;



            case EVENT_ICC_RECORD_EVENTS:

                if ((mCurrentAppType == UiccController.APP_FAM_3GPP) && (mIccRecords != null)) {

                    AsyncResult ar = (AsyncResult)msg.obj;
@@ -277,17 +265,6 @@ public class IccCardProxy extends Handler implements IccCard { 
        }

    }



    private void onSubscriptionActivated() {

        updateIccAvailability();

        updateStateProperty();

    }



    private void onSubscriptionDeactivated() {

        resetProperties();

        updateIccAvailability();

        updateStateProperty();

    }



    private void onRecordsLoaded() {

        broadcastInternalIccStateChangedIntent(IccCardConstants.INTENT_VALUE_ICC_LOADED, null);

    }

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

+680 −1

File changed.

Preview size limit exceeded, changes collapsed.

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

+5 −0
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ public class UiccSlot extends Handler { 
                    sendMessage(obtainMessage(EVENT_CARD_REMOVED, null));

                }



                // todo: broadcast sim state changed for absent/unknown



                // no card present in the slot now; dispose card and make mUiccCard null

                mUiccCard.dispose();

                mUiccCard = null;
@@ -243,6 +245,9 @@ public class UiccSlot extends Handler { 
            mUiccCard.dispose();

        }

        mUiccCard = null;



        // todo: broadcast sim state changed for absent/unknown



        mCardState = CardState.CARDSTATE_ABSENT;

        mLastRadioState = RadioState.RADIO_UNAVAILABLE;

    }