Merge "Telephony: Fix NV ready state"

Wink Saville · Android (Google) Code Review · commit cbc41deaa309 · 2012-04-09T14:22:13.000-07:00
diff --git a/telephony/java/com/android/internal/telephony/IccCard.java b/telephony/java/com/android/internal/telephony/IccCard.java
@@ -580,7 +580,9 @@ private void handleIccCardStatus(IccCardStatus newCardStatus) {
             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();
         }

Original file line number	Diff line number	Diff line change
`@@ -580,7 +580,9 @@ private void handleIccCardStatus(IccCardStatus newCardStatus) {`
`580`	`580`	`mHandler.sendMessage(mHandler.obtainMessage(EVENT_CARD_ADDED, null));`
`581`	`581`	`}`
`582`	`582`
`583`		`- if (oldState != State.READY && newState == State.READY) {`
	`583`	`+ // Call onReady only when SIM or RUIM card becomes ready (not NV)`
	`584`	`+ if (oldState != State.READY && newState == State.READY &&`
	`585`	`+ (is3gpp \|\| isSubscriptionFromIccCard)) {`
`584`	`586`	`mIccFileHandler.setAid(getAid());`
`585`	`587`	`mIccRecords.onReady();`
`586`	`588`	`}`