NPE fix Check parent app for null in SIMRecords.

[android/platform/frameworks/opt/telephony.git] / src / java / com / android / internal / telephony / uicc / SIMRecords.java

diff --git a/src/java/com/android/internal/telephony/uicc/SIMRecords.java b/src/java/com/android/internal/telephony/uicc/SIMRecords.java
index ac23652944b008dcc4b202066ddd34741b8b2ba7..dc5e9b29c08685d7d0bed764a518335ca1be71b4 100644 (file)
--- a/src/java/com/android/internal/telephony/uicc/SIMRecords.java
+++ b/src/java/com/android/internal/telephony/uicc/SIMRecords.java
@@ -1492,7 +1492,7 @@ public class SIMRecords extends IccRecords {
     public int getDisplayRule(String plmn) {
         int rule;
 
-        if (mParentApp.getUiccCard() != null &&
+        if (mParentApp != null && mParentApp.getUiccCard() != null &&
             mParentApp.getUiccCard().getOperatorBrandOverride() != null) {
         // If the operator has been overridden, treat it as the SPN file on the SIM did not exist.
             rule = SPN_RULE_SHOW_PLMN;