diff options
| author | Wink Saville <wink@google.com> | 2012-04-09 14:22:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-09 14:22:13 -0700 |
| commit | cbc41deaa309801acac80d667f3e787a3afa2261 (patch) | |
| tree | 5a91f1b56b755767d89089877216cbc68a9136ca /telephony | |
| parent | e80203959df635536143e9a8c88ec0685c90322b (diff) | |
| parent | 784eb36b884242d92b38b9f8cf572c205a9ff787 (diff) | |
| download | frameworks_base-cbc41deaa309801acac80d667f3e787a3afa2261.zip frameworks_base-cbc41deaa309801acac80d667f3e787a3afa2261.tar.gz frameworks_base-cbc41deaa309801acac80d667f3e787a3afa2261.tar.bz2 | |
Merge "Telephony: Fix NV ready state"
Diffstat (limited to 'telephony')
| -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(); } |