app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelManager.kt

@@ -29,7 +29,7 @@ open class EuiccChannelManager(protected val context: Context) {
     }
 
     protected open val uiccCards: Collection<UiccCardInfoCompat>
-        get() = (0 until tm.activeModemCountCompat).map { FakeUiccCardInfoCompat(it) }
+        get() = (0..<tm.activeModemCountCompat).map { FakeUiccCardInfoCompat(it) }
 
     private suspend fun ensureSEService() {
          if (seService == null) {

app-common/src/main/java/im/angry/openeuicc/ui/NotificationsActivity.kt

@@ -59,7 +59,7 @@ class NotificationsActivity: AppCompatActivity(), OpenEuiccContextMarker {
         refresh()
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         super.onCreateOptionsMenu(menu)
         menuInflater.inflate(R.menu.activity_notifications, menu)
         return true

libs/lpac-jni/src/main/jni/Android.bp

@@ -13,6 +13,16 @@ cc_library_static {
     ],
 }
 
+cc_library_static {
+    name: "liblpac-asn1c",
+    defaults: ["lpac-jni-defaults"],
+    local_include_dirs: ["lpac/euicc/asn1c"],
+    cflags: ["-DHAVE_CONFIG_H"],
+    srcs: [
+        "lpac/euicc/asn1c/asn1/*.c",
+    ],
+}
+
 cc_library_static {
     name: "liblpac-euicc",
     defaults: ["lpac-jni-defaults"],
@@ -20,6 +30,7 @@ cc_library_static {
         "lpac/euicc/*.c",
     ],
     static_libs: [
+        "liblpac-asn1c",
         "liblpac-cjson",
     ],
 }
@@ -33,6 +44,7 @@ cc_library_shared {
     ],
     static_libs: [
         "liblpac-euicc",
+        "liblpac-asn1c",
         "liblpac-cjson",
     ],
     shared_libs: ["liblog"],