diff options
| author | Kazuhiro Ondo <kazuhiro.ondo@motorola.com> | 2012-05-09 09:44:32 -0700 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2012-05-21 14:09:17 -0700 |
| commit | 8f669f49faf6084ad0132a02a474209907a069ce (patch) | |
| tree | bd39f878ae0a4c37e62a31583d5f84db1738f206 /telephony | |
| parent | d7e4ae48c576d5aaef75754b29a8b87c1f0d6427 (diff) | |
| download | frameworks_base-8f669f49faf6084ad0132a02a474209907a069ce.zip frameworks_base-8f669f49faf6084ad0132a02a474209907a069ce.tar.gz frameworks_base-8f669f49faf6084ad0132a02a474209907a069ce.tar.bz2 | |
Improve sim ready event handling for CdmaLte.
bug: 6463933
Change-Id: I751f760badb87c1fe4b78fd68921257cec4a4b9d
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/IccCard.java | 8 | ||||
| -rwxr-xr-x | telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java | 11 |
2 files changed, 15 insertions, 4 deletions
diff --git a/telephony/java/com/android/internal/telephony/IccCard.java b/telephony/java/com/android/internal/telephony/IccCard.java index d738d7b..fcf2f92 100644 --- a/telephony/java/com/android/internal/telephony/IccCard.java +++ b/telephony/java/com/android/internal/telephony/IccCard.java @@ -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)) { - mIccFileHandler.setAid(getAid()); + 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(); } } diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java index 9b4d172..25cd112 100755 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java @@ -293,8 +293,15 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { EVENT_RUIM_RECORDS_LOADED, null); mNeedToRegForRuimLoaded = false; } - if (DBG) log("Receive EVENT_RUIM_READY and Send Request getCDMASubscription."); - getSubscriptionInfoAndStartPollingThreads(); + + 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; |