修复: Android 16 上 overrideConfig 导致系统电话进程崩溃

在 Android 16 (SDK 36) 上，调用 overrideConfig(persistent=true) 会导致
com.android.phone 系统进程崩溃，抛出 SecurityException。由于崩溃发生在
不同的进程中，应用的 try-catch 无法捕获该异常。

此修改通过检测 SDK 版本，在 Android 16+ 上直接使用 persistent=false，
从根本上避免崩溃。代价是重启后运营商配置会丢失，但可通过 Shizuku
重新应用，属于可接受的折衷方案。

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: 2 people

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

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.app.IActivityManager
 import android.app.Instrumentation
 import android.content.Context
+import android.os.Build
 import android.os.Bundle
 import android.system.Os
 import android.telephony.CarrierConfigManager
@@ -26,15 +27,8 @@ class BrokerInstrumentation : Instrumentation() {
             val configurationManager = this.context.getSystemService(CarrierConfigManager::class.java)
             val overrideValues = toPersistableBundle(arguments)
 
-            try {
-                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
-                }
-            }
+            val persistent = Build.VERSION.SDK_INT < 36
+            configurationManager.overrideConfig(subId, overrideValues, persistent)
         } finally {
             Log.i(TAG, "applyConfig done")
             am.stopDelegateShellPermissionIdentity()
@@ -49,15 +43,8 @@ class BrokerInstrumentation : Instrumentation() {
         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
-                }
-            }
+            val persistent = Build.VERSION.SDK_INT < 36
+            configurationManager.overrideConfig(subId, null, persistent)
         } finally {
             Log.i(TAG, "clearConfig done")
             am.stopDelegateShellPermissionIdentity()

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

@@ -171,11 +171,12 @@ class SubscriptionModer(
 
     private fun overrideConfigDirectly(bundle: Bundle?) {
         val iCclInstance = this.loadCachedInterface { carrierConfigLoader }
+        val persistent = Build.VERSION.SDK_INT < 36
         if (bundle != null) {
             val args = toPersistableBundle(bundle)
-            iCclInstance.overrideConfig(subscriptionId, args, true)
+            iCclInstance.overrideConfig(subscriptionId, args, persistent)
         } else {
-            iCclInstance.overrideConfig(subscriptionId, null, true)
+            iCclInstance.overrideConfig(subscriptionId, null, persistent)
         }
     }