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

Commit 76d39ad5 authored by Peter Wang's avatar Peter Wang Committed by Gerrit Code Review
Browse files

Merge "Add 5G RAT"

parents 9374742b 581e89e4

src/java/com/android/internal/telephony/uicc/euicc/EuiccCard.java

+12 −0
Original line number Diff line number Diff line
@@ -99,6 +99,9 @@ public class EuiccCard extends UiccCard { 
    private static final String DEV_CAP_EUTRAN = "eutran";

    private static final String DEV_CAP_NFC = "nfc";

    private static final String DEV_CAP_CRL = "crl";

    private static final String DEV_CAP_NREPC = "nrepc";

    private static final String DEV_CAP_NR5GC = "nr5gc";

    private static final String DEV_CAP_EUTRAN5GC = "eutran5gc";



    // These interfaces are used for simplifying the code by leveraging lambdas.

    private interface ApduRequestBuilder {
@@ -1059,6 +1062,15 @@ public class EuiccCard extends UiccCard { 
            case DEV_CAP_CRL:

                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_7, versionBytes);

                break;

            case DEV_CAP_NREPC:

                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_9, versionBytes);

                break;

            case DEV_CAP_NR5GC:

                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_10, versionBytes);

                break;

            case DEV_CAP_EUTRAN5GC:

                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_11, versionBytes);

                break;

            default:

                loge("Invalid device capability name: " + devCap);

                break;

src/java/com/android/internal/telephony/uicc/euicc/Tags.java

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ class Tags { 
    static final int TAG_CTX_6 = 0x86;

    static final int TAG_CTX_7 = 0x87;

    static final int TAG_CTX_8 = 0x88;

    static final int TAG_CTX_9 = 0x89;

    static final int TAG_CTX_10 = 0x8A;

    static final int TAG_CTX_11 = 0x8B;



    // Context tags for constructed (compound) types

    static final int TAG_CTX_COMP_0 = 0xA0;

    static final int TAG_CTX_COMP_1 = 0xA1;