PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Mainline remove hide api SubscriptionInfo.getCardString"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-01 06:45:02 +00:00
committed by Android (Google) Code Review
parent 23331b2983 5189dc3860
commit d4f33b1e26
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/network/SubscriptionUtil.java
View File

@@ -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;
}
}