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

Commit 2c206ab5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "support rspCrlversion for RSP2.x.0" am: 546fdcb7 am: 2ccfca2f am: cb0c5e42 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2309218



Change-Id: I7829d3b28a7a72820cfd919b3162452a46725386
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ec908feb cb0c5e42

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

+5 −3
Original line number Diff line number Diff line
@@ -979,15 +979,17 @@ public class EuiccPort extends UiccPort { 
        }



        String devCap = split[0].trim();

        Integer version;

        String[] fullVer = (split[1].trim()).split("\\.");

        Integer version, subVersion = 0;

        try {

            version = Integer.parseInt(split[1].trim());

            version = Integer.parseInt(fullVer[0]);

            if (fullVer.length > 1) subVersion = Integer.parseInt(fullVer[1]);

        } catch (NumberFormatException e) {

            loge("Invalid device capability version number.", e);

            return;

        }



        byte[] versionBytes = new byte[] { version.byteValue(), 0, 0 };

        byte[] versionBytes = new byte[] { version.byteValue(), subVersion.byteValue(), 0 };

        switch (devCap) {

            case DEV_CAP_GSM:

                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_0, versionBytes);