From 5189dc38604d0911732c79da2fc81e65d0e52da1 Mon Sep 17 00:00:00 2001
From: SongFerngWang <songferngwang@google.com>
Date: Fri, 31 Jan 2020 16:55:48 +0800
Subject: [PATCH] Mainline remove hide api SubscriptionInfo.getCardString

Bug: 147128878
Test: build pass
Change-Id: Idb44af6a01626013339f5ca05486dd11112a5867
---
 src/com/android/settings/network/SubscriptionUtil.java       | 5 +----
 .../com/android/settings/network/SubscriptionUtilTest.java   | 5 -----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java
index 9105db82083..e61cc36d37e 100644
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -27,7 +27,6 @@ import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.telephony.UiccSlotInfo;
-import android.text.TextUtils;
 
 import androidx.annotation.VisibleForTesting;
 
@@ -159,9 +158,7 @@ public class SubscriptionUtil {
             // verify if subscription is inserted within slot
             for (UiccSlotInfo slotInfo : slotsInfo) {
                 if ((slotInfo != null) && (!slotInfo.getIsEuicc())
-                        && (slotInfo.getCardStateInfo() == CARD_STATE_INFO_PRESENT)
-                        && (slotInfo.getLogicalSlotIdx() == subInfo.getSimSlotIndex())
-                        && TextUtils.equals(slotInfo.getCardId(), subInfo.getCardString())) {
+                        && (slotInfo.getLogicalSlotIdx() == subInfo.getSimSlotIndex())) {
                     return true;
                 }
             }
diff --git a/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java b/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java
index 5afd4c4ce15..a18e49d0174 100644
--- a/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java
+++ b/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java
@@ -96,15 +96,12 @@ public class SubscriptionUtilTest {
 
         when(info1.getSubscriptionId()).thenReturn(111);
         when(info1.getSimSlotIndex()).thenReturn(-1);
-        when(info1.getCardString()).thenReturn("info1_cardid");
 
         when(info2.getSubscriptionId()).thenReturn(222);
         when(info2.getSimSlotIndex()).thenReturn(-1);
-        when(info2.getCardString()).thenReturn("info2_cardid");
 
         when(info3.getSubscriptionId()).thenReturn(333);
         when(info3.getSimSlotIndex()).thenReturn(0);
-        when(info3.getCardString()).thenReturn("info3_cardid");
 
         when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info1));
         when(mSubMgr.getAllSubscriptionInfoList()).thenReturn(Arrays.asList(info1, info2, info3));
@@ -114,11 +111,9 @@ public class SubscriptionUtilTest {
 
         when(info2slot.getLogicalSlotIdx()).thenReturn(-1);
         when(info2slot.getCardStateInfo()).thenReturn(CARD_STATE_INFO_ABSENT);
-        when(info2slot.getCardId()).thenReturn("info2_cardid");
 
         when(info3slot.getLogicalSlotIdx()).thenReturn(0);
         when(info3slot.getCardStateInfo()).thenReturn(CARD_STATE_INFO_PRESENT);
-        when(info3slot.getCardId()).thenReturn("info3_cardid");
 
         final UiccSlotInfo[] slotInfos = {info2slot, info3slot};
         when(mTelMgr.getUiccSlotsInfo()).thenReturn(slotInfos);