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

Commit 71c8c958 authored by nadlabak's avatar nadlabak
Browse files

GsmCdmaPhone: Fix GSM SIM card ICCID on NV sub CDMA devices 

The commit 94ae0fe7
("GsmCdmaPhone: Return dummy ICCID serial for NV sub")
broke the reported ICCID for GSM SIM cards when used
in global capable NV subscription CDMA devices.

GSM SIM ICCID shouldn't depend on the selected CDMA
subscription source in any way.

Change-Id: Ief48eba854f7c954eaa5132742fe00dc8aa9be13
parent a17ff1d7

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

+6 −6
Original line number Diff line number Diff line
@@ -741,11 +741,11 @@ public class GsmCdmaPhone extends Phone { 


    @Override

    public String getIccSerialNumber() {

        IccRecords r = mIccRecords.get();

        if (!isPhoneTypeGsm() && r == null) {

            if (mCdmaSubscriptionSource == CDMA_SUBSCRIPTION_NV) {

                return DUMMY_NV_ICC_SERIAL;

            }

        IccRecords r = mIccRecords.get();

        if (!isPhoneTypeGsm() && r == null) {

            // to get ICCID form SIMRecords because it is on MF.

            r = mUiccController.getIccRecords(mPhoneId, UiccController.APP_FAM_3GPP);

        }
@@ -754,11 +754,11 @@ public class GsmCdmaPhone extends Phone { 


    @Override

    public String getFullIccSerialNumber() {

        IccRecords r = mIccRecords.get();

        if (!isPhoneTypeGsm() && r == null) {

            if (mCdmaSubscriptionSource == CDMA_SUBSCRIPTION_NV) {

                return DUMMY_NV_ICC_SERIAL;

            }

        IccRecords r = mIccRecords.get();

        if (!isPhoneTypeGsm() && r == null) {

            // to get ICCID form SIMRecords because it is on MF.

            r = mUiccController.getIccRecords(mPhoneId, UiccController.APP_FAM_3GPP);

        }