When disabling pSIM, make sure to trail 'F's when comparing iccid.

When disabling pSIM, we compare iccid(cardId) in the SIM slot and iccid
in the subscription. We should make sure trailing Fs are removed before
we compare.

Bug: 155560092
Test: unittest && manual
Change-Id: Ia442d216e847c9d345c993876467e0654e29bc90

1 files changed, 25 insertions, 1 deletions

diff --git a/tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java b/tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java
index 5e4ab90d20..cf65e4549f 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/SubscriptionControllerTest.java
@@ -26,7 +26,9 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.atLeast;
@@ -42,6 +44,7 @@ import android.content.ContentValues;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.ParcelUuid;
 import android.os.UserHandle;
 import android.provider.Settings;
@@ -86,6 +89,8 @@ public class SubscriptionControllerTest extends TelephonyTest {
     private MultiSimSettingController mMultiSimSettingControllerMock;
     @Mock
     private ISetOpportunisticDataCallback mSetOpptDataCallback;
+    @Mock
+    private Handler mHandler;
 
     private static final String MAC_ADDRESS_PREFIX = "mac_";
     private static final String DISPLAY_NAME_PREFIX = "my_phone_";
@@ -1453,7 +1458,11 @@ public class SubscriptionControllerTest extends TelephonyTest {
 
 
     private UiccSlotInfo getFakeUiccSlotInfo(boolean active, int logicalSlotIndex) {
-        return new UiccSlotInfo(active, false, "fake card Id",
+        return getFakeUiccSlotInfo(active, logicalSlotIndex, "fake card Id");
+    }
+
+    private UiccSlotInfo getFakeUiccSlotInfo(boolean active, int logicalSlotIndex, String cardId) {
+        return new UiccSlotInfo(active, false, cardId,
                 UiccSlotInfo.CARD_STATE_INFO_PRESENT, logicalSlotIndex, true, true);
     }
 
@@ -1534,4 +1543,19 @@ public class SubscriptionControllerTest extends TelephonyTest {
         assertEquals(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID,
                 mSubscriptionControllerUT.getPreferredDataSubscriptionId());
     }
+
+    @Test
+    public void testSetSubscriptionEnabled_disableActivePsim_cardIdWithTrailingF() {
+        String iccId = "123F";
+        mSubscriptionControllerUT.addSubInfoRecord(iccId, 0);
+        mSubscriptionControllerUT.registerForUiccAppsEnabled(mHandler, 0, null, false);
+        UiccSlotInfo slot = getFakeUiccSlotInfo(true, 0, iccId + "FF");
+        UiccSlotInfo[] uiccSlotInfos = {slot};
+        doReturn(uiccSlotInfos).when(mTelephonyManager).getUiccSlotsInfo();
+
+        mSubscriptionControllerUT.setSubscriptionEnabled(false, 1);
+        verify(mHandler).sendMessageAtTime(any(), anyLong());
+        assertFalse(mSubscriptionControllerUT.getActiveSubscriptionInfo(
+                1, mContext.getOpPackageName(), null).areUiccApplicationsEnabled());
+    }
 }