fix: throw NoSuchMethodError in overrideConfig only if persistent=true

Author: yhkee0404

app/src/main/java/dev/bluehouse/enablevolte/BrokerInstrumentation.kt

@@ -26,11 +26,10 @@ class BrokerInstrumentation : Instrumentation() {
             val configurationManager = this.context.getSystemService(CarrierConfigManager::class.java)
 
             try {
-                return configurationManager.overrideConfig(subId, overrideValues, overrideConfigPersistent)
+                configurationManager.overrideConfig(subId, overrideValues, overrideConfigPersistent)
             } catch (e: NoSuchMethodError) {
+                configurationManager.overrideConfig(subId, overrideValues)
             }
-
-            configurationManager.overrideConfig(subId, overrideValues)
         } finally {
             am.stopDelegateShellPermissionIdentity()
         }

app/src/main/java/dev/bluehouse/enablevolte/Moder.kt

@@ -142,25 +142,21 @@ class SubscriptionModer(
     private fun overrideConfigDirectly(bundle: Bundle?) {
         val iCclInstance = this.loadCachedInterface { carrierConfigLoader }
         val args = bundle?.let(::toPersistableBundle)
-        var securityException: SecurityException? = null
-        var noSuchMethodError: NoSuchMethodError? = null
 
         try {
-            return iCclInstance.overrideConfig(subscriptionId, args, overrideConfigPersistent)
-        } catch (e: SecurityException) {
-            securityException = e
+            iCclInstance.overrideConfig(subscriptionId, args, overrideConfigPersistent)
         } catch (e: NoSuchMethodError) {
-            noSuchMethodError = e
+            val overrideConfigMethod =
+                iCclInstance.javaClass.getMethod(
+                    "overrideConfig",
+                    Int::class.javaPrimitiveType,
+                    PersistableBundle::class.java,
+                )
+            overrideConfigMethod.invoke(iCclInstance, subscriptionId, args)
+            if (overrideConfigPersistent) {
+                throw e
+            }
         }
-
-        val overrideConfigMethod =
-            iCclInstance.javaClass.getMethod(
-                "overrideConfig",
-                Int::class.javaPrimitiveType,
-                PersistableBundle::class.java,
-            )
-        overrideConfigMethod.invoke(iCclInstance, subscriptionId, args)
-        throw securityException ?: noSuchMethodError!!
     }
 
     private fun overrideConfigUsingBroker(bundle: Bundle?) {
@@ -291,7 +287,6 @@ class SubscriptionModer(
         } catch (e: NoSuchMethodError) {
             telephony.disableIms(sub.getSlotIndex(this.subscriptionId))
             telephony.enableIms(sub.getSlotIndex(this.subscriptionId))
-            throw e
         }
     }