Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e08ec8af authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Gerrit Code Review
Browse files

Merge "Remove trailing 'F's in IccId when quering sub database with it"

parents 8cc224ba fb5b4750

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -93,6 +93,7 @@ import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppType; 
import com.android.internal.telephony.uicc.IccCardStatus;

import com.android.internal.telephony.uicc.IccCardStatus;

import com.android.internal.telephony.uicc.IccException;

import com.android.internal.telephony.uicc.IccException;

import com.android.internal.telephony.uicc.IccRecords;

import com.android.internal.telephony.uicc.IccRecords;

import com.android.internal.telephony.uicc.IccUtils;

import com.android.internal.telephony.uicc.IccVmNotSupportedException;

import com.android.internal.telephony.uicc.IccVmNotSupportedException;

import com.android.internal.telephony.uicc.IsimRecords;

import com.android.internal.telephony.uicc.IsimRecords;

import com.android.internal.telephony.uicc.IsimUiccRecords;

import com.android.internal.telephony.uicc.IsimUiccRecords;
@@ -4220,7 +4221,8 @@ public class GsmCdmaPhone extends Phone { 
        String iccId = slot.getIccId();

        String iccId = slot.getIccId();

        if (iccId == null) return;

        if (iccId == null) return;





        SubscriptionInfo info = SubscriptionController.getInstance().getSubInfoForIccId(iccId);

        SubscriptionInfo info = SubscriptionController.getInstance().getSubInfoForIccId(

                IccUtils.stripTrailingFs(iccId));





        // If info is null, it could be a new subscription. By default we enable it.

        // If info is null, it could be a new subscription. By default we enable it.

        boolean expectedValue = info == null ? true : info.areUiccApplicationsEnabled();

        boolean expectedValue = info == null ? true : info.areUiccApplicationsEnabled();

src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -456,7 +456,7 @@ public class SubscriptionInfoUpdater extends Handler { 
        UiccSlot slot = UiccController.getInstance().getUiccSlotForPhone(phoneId);

        UiccSlot slot = UiccController.getInstance().getUiccSlotForPhone(phoneId);

        if (slot == null || slot.getIccId() == null) return false;

        if (slot == null || slot.getIccId() == null) return false;

        SubscriptionInfo info = SubscriptionController.getInstance()

        SubscriptionInfo info = SubscriptionController.getInstance()

                .getSubInfoForIccId(slot.getIccId());

                .getSubInfoForIccId(IccUtils.stripTrailingFs(slot.getIccId()));

        return info != null && !info.areUiccApplicationsEnabled();

        return info != null && !info.areUiccApplicationsEnabled();

    }

    }