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

Commit 4c8295ee authored by Jordan Liu's avatar Jordan Liu
Browse files

Populate SubscriptionInfo with cardId 

Use the new int cardId mapping from UiccController.

Bug: 80097562
Test: manual
Change-Id: I5794aec05ccf83f1e143035c2ff4fb49e1faa46f
Merged-In: I5794aec05ccf83f1e143035c2ff4fb49e1faa46f
parent 9d717e45

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

+8 −3
Original line number Diff line number Diff line
@@ -303,10 +303,13 @@ public class SubscriptionController extends ISub.Stub { 
                SubscriptionManager.MCC_STRING));

        String mnc = cursor.getString(cursor.getColumnIndexOrThrow(

                SubscriptionManager.MNC_STRING));

        // cardId is the private ICCID/EID string, also known as the card string

        String cardId = cursor.getString(cursor.getColumnIndexOrThrow(

                SubscriptionManager.CARD_ID));

        String countryIso = cursor.getString(cursor.getColumnIndexOrThrow(

                SubscriptionManager.ISO_COUNTRY_CODE));

        // publicCardId is the publicly exposed int card ID

        int publicCardId = UiccController.getInstance().convertToPublicCardId(cardId);

        boolean isEmbedded = cursor.getInt(cursor.getColumnIndexOrThrow(

                SubscriptionManager.IS_EMBEDDED)) == 1;

        int carrierId = cursor.getInt(cursor.getColumnIndexOrThrow(
@@ -334,8 +337,9 @@ public class SubscriptionController extends ISub.Stub { 
                    + " dataRoaming:" + dataRoaming + " mcc:" + mcc + " mnc:" + mnc

                    + " countIso:" + countryIso + " isEmbedded:"

                    + isEmbedded + " accessRules:" + Arrays.toString(accessRules)

                    + " cardId:" + cardIdToPrint + " isOpportunistic:" + isOpportunistic

                    + " groupUUID:" + groupUUID + " isMetered:" + isMetered);

                    + " cardId:" + cardIdToPrint + " publicCardId:" + publicCardId

                    + " isOpportunistic:" + isOpportunistic + " groupUUID:" + groupUUID

                    + " isMetered:" + isMetered);

        }



        // If line1number has been set to a different number, use it instead.
@@ -345,7 +349,8 @@ public class SubscriptionController extends ISub.Stub { 
        }

        return new SubscriptionInfo(id, iccId, simSlotIndex, displayName, carrierName,

                nameSource, iconTint, number, dataRoaming, iconBitmap, mcc, mnc, countryIso,

                isEmbedded, accessRules, cardId, isOpportunistic, groupUUID, isMetered, carrierId);

                isEmbedded, accessRules, cardId, publicCardId, isOpportunistic, groupUUID,

                isMetered, false /* isGroupDisabled = false */, carrierId);

    }



    /**