Commit 1af0844a authored Aug 23, 2019 by vivi.li Committed by Li Vivi Sep 12, 2019

SIM card with EF_SPN and display condition b2=0 b1=0，registered home network,...

SIM card with EF_SPN and display condition b2=0 b1=0，registered home network, the carrier name display was wrong

By looking at the 3GPP protocol, EF_EHPLMN does not mandate that it must contain
the hplmn of the IMSI; therefore, the getHomePlmns method needs to be modified.
If EF_EHPLMN exists, and hplmn is not included, the hplmn should be appended.

Test: manual

Bug:139902828

parent 95853dbc

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -993,6 +993,8 @@ public abstract class IccRecords extends Handler implements IccConstants {
		if (!ArrayUtils.isEmpty(spdi)) {
		hplmns = ArrayUtils.concatElements(String.class, hplmns, spdi);
		}
		// If hplmns don't contain hplmn, we need to add hplmn to hplmns
		hplmns = ArrayUtils.appendElement(String.class, hplmns, hplmn);
		return hplmns;
		}