Merge "NPE fix Check parent app for null in SIMRecords." into lmp-dev (11eb5d9c) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/uicc/SIMRecords.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1492,7 +1492,7 @@ public class SIMRecords extends IccRecords {
	public int getDisplayRule(String plmn) {		public int getDisplayRule(String plmn) {
	int rule;		int rule;

	if (mParentApp.getUiccCard() != null &&		if (mParentApp != null && mParentApp.getUiccCard() != null &&
	mParentApp.getUiccCard().getOperatorBrandOverride() != null) {		mParentApp.getUiccCard().getOperatorBrandOverride() != null) {
	// If the operator has been overridden, treat it as the SPN file on the SIM did not exist.		// If the operator has been overridden, treat it as the SPN file on the SIM did not exist.
	rule = SPN_RULE_SHOW_PLMN;		rule = SPN_RULE_SHOW_PLMN;