From 9560590d8939138477d3ea9bf0479f2ec3c8a1b4 Mon Sep 17 00:00:00 2001
From: sandeepjs <sandeepjs@google.com>
Date: Mon, 24 Jan 2022 06:20:31 +0000
Subject: [PATCH] Adding compareIgnoreTrailingFs helper method to compare
 IccId's

Test: build, manual
Bug: 213434330
Change-Id: I20c37c4178c269b71864220852ba067ff70191ba
---
 .../com/android/internal/telephony/uicc/IccUtils.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/telephony/java/com/android/internal/telephony/uicc/IccUtils.java b/telephony/java/com/android/internal/telephony/uicc/IccUtils.java
index 21c3f760771c6..f518d53fa5177 100644
--- a/telephony/java/com/android/internal/telephony/uicc/IccUtils.java
+++ b/telephony/java/com/android/internal/telephony/uicc/IccUtils.java
@@ -24,6 +24,7 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.os.Build;
 import android.telephony.UiccPortInfo;
+import android.text.TextUtils;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.telephony.GsmAlphabet;
@@ -933,6 +934,13 @@ public class IccUtils {
         return s == null ? null : s.replaceAll("(?i)f*$", "");
     }
 
+    /**
+     * Strip all the trailing 'F' characters of a string if exists and compare.
+     */
+    public static boolean compareIgnoreTrailingFs(String a, String b) {
+        return TextUtils.equals(a, b) || TextUtils.equals(stripTrailingFs(a), stripTrailingFs(b));
+    }
+
     /**
      * Converts a character of [0-9a-fA-F] to its hex value in a byte. If the character is not a
      * hex number, 0 will be returned.