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

Commit d7626f26 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 47fca44b: am 7e12cf03: Merge "Improve sim ready event handling for CdmaLte." into jb-dev 

* commit '47fca44b':
  Improve sim ready event handling for CdmaLte.
parents 16353830 47fca44b

telephony/java/com/android/internal/telephony/IccCard.java

+6 −2
Original line number Diff line number Diff line
@@ -579,10 +579,14 @@ public class IccCard { 
            mHandler.sendMessage(mHandler.obtainMessage(EVENT_CARD_ADDED, null));

        }



        // Call onReady only when SIM or RUIM card becomes ready (not NV)

        // Call onReady Record(s) on the IccCard becomes ready (not NV)

        if (oldState != State.READY && newState == State.READY &&

                (is3gpp || isSubscriptionFromIccCard)) {

            if (!(mIccFileHandler instanceof CdmaLteUiccFileHandler)) {

                // CdmaLteUicc File Handler deals with both USIM and CSIM.

                // Do not lock onto one AID for now.

                mIccFileHandler.setAid(getAid());

            }

            mIccRecords.onReady();

        }

    }

telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

+9 −2
Original line number Diff line number Diff line
@@ -293,8 +293,15 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 
                        EVENT_RUIM_RECORDS_LOADED, null);

                mNeedToRegForRuimLoaded = false;

            }



            if (phone.getLteOnCdmaMode() == Phone.LTE_ON_CDMA_TRUE) {

                // Subscription will be read from SIM I/O

                if (DBG) log("Receive EVENT_RUIM_READY");

                pollState();

            } else {

                if (DBG) log("Receive EVENT_RUIM_READY and Send Request getCDMASubscription.");

                getSubscriptionInfoAndStartPollingThreads();

            }

            phone.prepareEri();

            break;