From 784eb36b884242d92b38b9f8cf572c205a9ff787 Mon Sep 17 00:00:00 2001
From: Wink Saville <wink@google.com>
Date: Mon, 9 Apr 2012 12:14:03 -0700
Subject: 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
---
 telephony/java/com/android/internal/telephony/IccCard.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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();
         }
-- 
cgit v1.1