From cacab05892f33fb1a1f792294c63139a7c5ecd4e Mon Sep 17 00:00:00 2001 From: TheScarastic Date: Mon, 8 Aug 2022 08:22:03 +0000 Subject: [PATCH 1/2] Add privapp permission whitelist for production builds --- Android.bp | 8 ++++++++ privapp_whitelist_im.angry.openeuicc.xml | 9 +++++++++ 2 files changed, 17 insertions(+) create mode 100644 privapp_whitelist_im.angry.openeuicc.xml diff --git a/Android.bp b/Android.bp index 331629f..3a77d03 100644 --- a/Android.bp +++ b/Android.bp @@ -28,9 +28,17 @@ android_app { resource_dirs: [ "app/src/main/res", ], + required: ["privapp_whitelist_im.angry.openeuicc.xml"], manifest: "app/src/main/AndroidManifest.xml", privileged: true, platform_apis: true, system_ext_specific: true, certificate: "platform", } + +prebuilt_etc { + name: "privapp_whitelist_im.angry.openeuicc.xml", + system_ext_specific: true, + src: "privapp_whitelist_im.angry.openeuicc.xml", + sub_dir: "permissions", +} diff --git a/privapp_whitelist_im.angry.openeuicc.xml b/privapp_whitelist_im.angry.openeuicc.xml new file mode 100644 index 0000000..88d35cc --- /dev/null +++ b/privapp_whitelist_im.angry.openeuicc.xml @@ -0,0 +1,9 @@ + + + + + + + + + From 5050b948b2ccab0217541cfa01c8e042ce33ce05 Mon Sep 17 00:00:00 2001 From: TheScarastic Date: Tue, 9 Aug 2022 10:46:52 +0000 Subject: [PATCH 2/2] Remove trailing comma for old Kotlin compiler before S --- app/src/main/java/im/angry/openeuicc/core/EuiccChannel.kt | 4 ++-- app/src/main/java/im/angry/openeuicc/core/OmapiChannel.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/im/angry/openeuicc/core/EuiccChannel.kt b/app/src/main/java/im/angry/openeuicc/core/EuiccChannel.kt index 84c8326..53fd3c7 100644 --- a/app/src/main/java/im/angry/openeuicc/core/EuiccChannel.kt +++ b/app/src/main/java/im/angry/openeuicc/core/EuiccChannel.kt @@ -8,7 +8,7 @@ data class EuiccChannelInfo( val cardId: Int, val name: String, val imei: String, - val removable: Boolean, + val removable: Boolean ) abstract class EuiccChannel( @@ -24,4 +24,4 @@ abstract class EuiccChannel( abstract val valid: Boolean abstract fun close() -} \ No newline at end of file +} diff --git a/app/src/main/java/im/angry/openeuicc/core/OmapiChannel.kt b/app/src/main/java/im/angry/openeuicc/core/OmapiChannel.kt index 281564c..aae55fb 100644 --- a/app/src/main/java/im/angry/openeuicc/core/OmapiChannel.kt +++ b/app/src/main/java/im/angry/openeuicc/core/OmapiChannel.kt @@ -9,7 +9,7 @@ import java.lang.Exception class OmapiChannel private constructor( info: EuiccChannelInfo, - private val channel: Channel, + private val channel: Channel ) : EuiccChannel(info) { companion object { private const val TAG = "OmapiChannel"