Merge "The method of parseEfSpdi does not match TS24008."
am: cd03d0db9d
Change-Id: I386f5e4de89c4ac758e1702b2efdc16a43c12c33
diff --git a/telephony/java/com/android/internal/telephony/uicc/IccUtils.java b/telephony/java/com/android/internal/telephony/uicc/IccUtils.java
index 67de87f..62d570c 100644
--- a/telephony/java/com/android/internal/telephony/uicc/IccUtils.java
+++ b/telephony/java/com/android/internal/telephony/uicc/IccUtils.java
@@ -64,7 +64,7 @@
/**
* PLMN (MCC/MNC) is encoded as per 24.008 10.5.1.3
* Returns a concatenated string of MCC+MNC, stripping
- * a trailing character for a 2-digit MNC
+ * all invalid character 'f'
*/
public static String bcdPlmnToString(byte[] data, int offset) {
if (offset + 3 > data.length) {
@@ -76,9 +76,9 @@
trans[2] = (byte) ((data[2 + offset] & 0xF0) | ((data[1 + offset] >> 4) & 0xF));
String ret = bytesToHexString(trans);
- // For a 2-digit MNC we trim the trailing 'f'
- if (ret.endsWith("f")) {
- ret = ret.substring(0, ret.length() - 1);
+ // For a valid plmn we trim all character 'f'
+ if (ret.contains("f")) {
+ ret = ret.replaceAll("f", "");
}
return ret;
}