Merge "Telephony: Fix NV ready state"

2012-04-09 14:22:13 -07:00
parent e80203959d 784eb36b88
commit cbc41deaa3
1 changed files with 3 additions and 1 deletions
--- 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();
        }