Merge "support rspCrlversion for RSP2.x.0" am: 546fdcb7c6

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

Change-Id: If54ea5866df3d2cad0b13db65ff25047dfb259bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/src/java/com/android/internal/telephony/uicc/euicc/EuiccPort.java b/src/java/com/android/internal/telephony/uicc/euicc/EuiccPort.java
index 45bc06d407..639915abcd 100644
--- a/src/java/com/android/internal/telephony/uicc/euicc/EuiccPort.java
+++ b/src/java/com/android/internal/telephony/uicc/euicc/EuiccPort.java
@@ -995,15 +995,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);