fix: support old carrierConfigManager.overrideConfig

Author: yhkee0404

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

@@ -5,6 +5,7 @@ import android.app.IActivityManager
 import android.app.Instrumentation
 import android.content.Context
 import android.os.Bundle
+import android.os.PersistableBundle
 import android.system.Os
 import android.telephony.CarrierConfigManager
 import android.util.Log
@@ -15,52 +16,49 @@ const val TAG = "BrokerInstrumentation"
 
 class BrokerInstrumentation : Instrumentation() {
     @SuppressLint("MissingPermission")
-    private fun applyConfig(
+    private fun overrideConfig(
         subId: Int,
-        arguments: Bundle,
+        overrideValues: PersistableBundle?,
     ) {
-        Log.i(TAG, "applyConfig")
         val am = IActivityManager.Stub.asInterface(ShizukuBinderWrapper(SystemServiceHelper.getSystemService(Context.ACTIVITY_SERVICE)))
-        am.startDelegateShellPermissionIdentity(Os.getuid(), null)
         try {
+            am.startDelegateShellPermissionIdentity(Os.getuid(), null)
             val configurationManager = this.context.getSystemService(CarrierConfigManager::class.java)
-            val overrideValues = toPersistableBundle(arguments)
 
             try {
-                configurationManager.overrideConfig(subId, overrideValues, true)
+                return configurationManager.overrideConfig(subId, overrideValues, true)
             } catch (e: SecurityException) {
-                if (e.message?.contains("overrideConfig with persistent=true only can be invoked by system app") == true) {
-                    configurationManager.overrideConfig(subId, overrideValues, false)
-                } else {
-                    throw e
-                }
-            }
+            } catch (e: NoSuchMethodError) {}
+
+            try {
+                return configurationManager.overrideConfig(subId, overrideValues, false)
+            } catch (e: SecurityException) {
+            } catch (e: NoSuchMethodError) {}
+
+            configurationManager.overrideConfig(subId, overrideValues)
         } finally {
-            Log.i(TAG, "applyConfig done")
             am.stopDelegateShellPermissionIdentity()
         }
     }
 
-    @SuppressLint("MissingPermission")
+    private fun applyConfig(
+        subId: Int,
+        arguments: Bundle,
+    ) {
+        Log.i(TAG, "applyConfig")
+        try {
+            this.overrideConfig(subId, toPersistableBundle(arguments))
+        } finally {
+            Log.i(TAG, "applyConfig done")
+        }
+    }
+
     private fun clearConfig(subId: Int) {
         Log.i(TAG, "clearConfig")
-        val am = IActivityManager.Stub.asInterface(ShizukuBinderWrapper(SystemServiceHelper.getSystemService(Context.ACTIVITY_SERVICE)))
-        am.startDelegateShellPermissionIdentity(Os.getuid(), null)
         try {
-            val configurationManager = this.context.getSystemService(CarrierConfigManager::class.java)
-
-            try {
-                configurationManager.overrideConfig(subId, null, true)
-            } catch (e: SecurityException) {
-                if (e.message?.contains("overrideConfig with persistent=true only can be invoked by system app") == true) {
-                    configurationManager.overrideConfig(subId, null, false)
-                } else {
-                    throw e
-                }
-            }
+            this.overrideConfig(subId, null)
         } finally {
             Log.i(TAG, "clearConfig done")
-            am.stopDelegateShellPermissionIdentity()
         }
     }