diff options
| author | Wink Saville <wink@google.com> | 2012-04-09 12:14:03 -0700 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2012-04-09 12:14:03 -0700 |
| commit | 784eb36b884242d92b38b9f8cf572c205a9ff787 (patch) | |
| tree | c491315cd567bb250c18f4f4cc906bcbaa284686 | |
| parent | 63c115c4aa2158ea18338a9fb2c2619755958ddc (diff) | |
| download | frameworks_base-784eb36b884242d92b38b9f8cf572c205a9ff787.zip frameworks_base-784eb36b884242d92b38b9f8cf572c205a9ff787.tar.gz frameworks_base-784eb36b884242d92b38b9f8cf572c205a9ff787.tar.bz2 | |
Telephony: Fix NV ready state
Don't trigger RuimRecords onReady so that it doesn't overwrite
mccmnc property value set by CdmaPhone in NV case.
Bug: 6153667
Change-Id: I2f25f6a69deecd085f11dbe1dbf752c2fd51cecb
| -rw-r--r-- | telephony/java/com/android/internal/telephony/IccCard.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/IccCard.java b/telephony/java/com/android/internal/telephony/IccCard.java index 2139917..92024cd 100644 --- a/telephony/java/com/android/internal/telephony/IccCard.java +++ b/telephony/java/com/android/internal/telephony/IccCard.java @@ -580,7 +580,9 @@ public class IccCard { mHandler.sendMessage(mHandler.obtainMessage(EVENT_CARD_ADDED, null)); } - if (oldState != State.READY && newState == State.READY) { + // Call onReady only when SIM or RUIM card becomes ready (not NV) + if (oldState != State.READY && newState == State.READY && + (is3gpp || isSubscriptionFromIccCard)) { mIccFileHandler.setAid(getAid()); mIccRecords.onReady(); } |