Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use Uppercase instead of Lowercase for PLMN Decode" into pi-dev

Browse Source 
am: 2125e5c59e

Change-Id: I850e3f98c9ce4b9221665552b50055bc31f72a04
This commit is contained in:
Robert Greenwalt
2018-06-12 16:07:28 -07:00
committed by android-build-merger
parent a0287cc821 2125e5c59e
commit 3b9e26fb5a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/com/android/internal/telephony/uicc/IccUtils.java
View File

@@ -105,7 +105,7 @@ public class IccUtils {
/**
* PLMN (MCC/MNC) is encoded as per 24.008 10.5.1.3
* Returns a concatenated string of MCC+MNC, stripping
* all invalid character 'f'
* all invalid character 'F'
*/
public static String bcdPlmnToString(byte[] data, int offset) {
if (offset + 3 > data.length) {
@@ -117,9 +117,9 @@ public class IccUtils {
trans[2] = (byte) ((data[2 + offset] & 0xF0) | ((data[1 + offset] >> 4) & 0xF));
String ret = bytesToHexString(trans);
// For a valid plmn we trim all character 'f'
if (ret.contains("f")) {
ret = ret.replaceAll("f", "");
// For a valid plmn we trim all character 'F'
if (ret.contains("F")) {
ret = ret.replaceAll("F", "");
}
return ret;
}