Merge pull request #467 from handymenny/shannon-nrdc

Support NRDC combos w/o featureSetCombinationD
handymenny · Sep 2, 2024 · 7bb861c · 7bb861c
2 parents 5727a13 + 8f7b041
commit 7bb861c
Show file tree

Hide file tree

Showing 6 changed files with 12,664 additions and 6 deletions.
diff --git a/src/main/java/it/smartphonecombo/uecapabilityparser/importer/ImportCapabilityInformation.kt b/src/main/java/it/smartphonecombo/uecapabilityparser/importer/ImportCapabilityInformation.kt
@@ -950,15 +950,17 @@ object ImportCapabilityInformation : ImportCapabilities {
         val list =
             bandCombinationsList?.mapIndexedNotNull { i, bandCombination ->
                 val nrCombo = nrCombos.getOrNull(i)
-                val featureSet =
-                    bandCombination
-                        .getObject("ca-ParametersNRDC")
-                        ?.getInt("featureSetCombinationDC")
+                val nrdc = bandCombination.getObject("ca-ParametersNRDC")
 
-                if (nrCombo == null || featureSet == null) {
+                // if nrdc is absent, nrdc isn't supported
+                if (nrCombo == null || nrdc == null) {
                     return@mapIndexedNotNull null
                 }
-                nrCombo.copy(featureSet = featureSet)
+
+                // if featureSetDc isn't set, use standard featureSet
+                val featureSetDc = nrdc.getInt("featureSetCombinationDC") ?: nrCombo.featureSet
+
+                nrCombo.copy(featureSet = featureSetDc)
             }
                 ?: emptyList()
         return list

diff --git a/...st/java/it/smartphonecombo/uecapabilityparser/importer/ImportCapabilityInformationTest.kt b/...st/java/it/smartphonecombo/uecapabilityparser/importer/ImportCapabilityInformationTest.kt
@@ -120,6 +120,16 @@ internal class ImportCapabilityInformationTest {
         parse("ueCapNrDc.json", "ueCapNrDc.json")
     }
 
+    @Test
+    fun ueCapNrDcShannon() {
+        parse("ueCapNrDcShannon.json", "ueCapNrDcShannon.json")
+    }
+
+    @Test
+    fun ueCapNrCaMmWave() {
+        parse("ueCapNrCaMmWave.json", "ueCapNrCaMmWave.json")
+    }
+
     @Test
     fun ueCapNrSUL() {
         parse("ueCapNrSUL.json", "ueCapNrSUL.json")