perf: shizuku bindServiceMutex

gkd-kit · Dec 4, 2024 · b82355c · b82355c
1 parent 709b6b3
commit b82355c
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/app/src/main/kotlin/li/songe/gkd/shizuku/ShizukuApi.kt b/app/src/main/kotlin/li/songe/gkd/shizuku/ShizukuApi.kt
@@ -18,6 +18,8 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.flow.updateAndGet
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withTimeoutOrNull
 import li.songe.gkd.META
 import li.songe.gkd.appScope
@@ -177,6 +179,7 @@ data class UserServiceWrapper(
     }
 }
 
+private val bindServiceMutex by lazy { Mutex() }
 private suspend fun buildServiceWrapper(): UserServiceWrapper? {
     val serviceArgs = Shizuku
         .UserServiceArgs(UserService::class.componentName)
@@ -208,15 +211,17 @@ private suspend fun buildServiceWrapper(): UserServiceWrapper? {
             LogUtils.d("onServiceDisconnected", componentName)
         }
     }
-    return withTimeoutOrNull(1000) {
-        suspendCoroutine { continuation ->
-            resumeCallback = { continuation.resume(it) }
-            Shizuku.bindUserService(serviceArgs, connection)
-        }
-    }.apply {
-        if (this == null) {
-            toast("Shizuku获取绑定服务超时失败")
-            unbindUserService(serviceArgs, connection)
+    bindServiceMutex.withLock {
+        return withTimeoutOrNull(3000) {
+            suspendCoroutine { continuation ->
+                resumeCallback = { continuation.resume(it) }
+                Shizuku.bindUserService(serviceArgs, connection)
+            }
+        }.apply {
+            if (this == null) {
+                toast("Shizuku获取绑定服务超时失败")
+                unbindUserService(serviceArgs, connection)
+            }
         }
     }
 }