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

Commit 5279e9e2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove trailing 'F's in IccId when quering sub database with it" into rvc-dev am: a9b113cf 

Change-Id: I39a07c516bc03adca04ee4e1006879931b457cd1
parents bab77097 a9b113cf

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

+3 −1
Original line number 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.IccException;

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.IsimRecords;

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

        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.

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

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

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

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

        SubscriptionInfo info = SubscriptionController.getInstance()

                .getSubInfoForIccId(slot.getIccId());

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

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

    }