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

Merge "Do not strip trailing F's of test ICCID" am: 78a8259df5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852927

Change-Id: I95ee3bacd503b1ab0cfe48b82fbe057d25aac96c
This commit is contained in:
Jordan Liu
2021-10-18 23:48:16 +00:00
committed by Automerger Merge Worker
parent 6f0afa50dc 78a8259df5
commit 60a553a4e6
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,10 @@ public class IccUtils {
@VisibleForTesting @VisibleForTesting
static final int FPLMN_BYTE_SIZE = 3; static final int FPLMN_BYTE_SIZE = 3;
// ICCID used for tests by some OEMs
// TODO(b/159354974): Replace the constant here with UiccPortInfo.ICCID_REDACTED once ready
private static final String TEST_ICCID = "FFFFFFFFFFFFFFFFFFFF";
// A table mapping from a number to a hex character for fast encoding hex strings. // A table mapping from a number to a hex character for fast encoding hex strings.
private static final char[] HEX_CHARS = { private static final char[] HEX_CHARS = {
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
@@ -923,6 +927,9 @@ public class IccUtils {
* Strip all the trailing 'F' characters of a string, e.g., an ICCID. * Strip all the trailing 'F' characters of a string, e.g., an ICCID.
*/ */
public static String stripTrailingFs(String s) { public static String stripTrailingFs(String s) {
if (TEST_ICCID.equals(s)) {
return s;
}
return s == null ? null : s.replaceAll("(?i)f*$", ""); return s == null ? null : s.replaceAll("(?i)f*$", "");
} }