perf: shizuku killLegacyService

Author: lisonge

app/src/main/aidl/li/songe/gkd/shizuku/IUserService.aidl

@@ -11,4 +11,5 @@ interface IUserService {
     Bitmap takeScreenshot1(int width, int height) = 3;
     Bitmap takeScreenshot2(in Rect crop, int rotation) = 4;
     Bitmap takeScreenshot3(in Rect crop) = 5;
+    int killLegacyService() = 6;
 }

app/src/main/kotlin/li/songe/gkd/shizuku/ShizukuApi.kt

@@ -156,6 +156,11 @@ class ShizukuContext(
             activityManager?.registerDefault()
         }
         grantSelf()
+        // 某些情况下存在残留进程
+        val size = serviceWrapper?.userService?.killLegacyService()
+        if (size != null && size > 0) {
+            LogUtils.d("killLegacyService $size")
+        }
     }
 }
 

app/src/main/kotlin/li/songe/gkd/shizuku/UserService.kt

@@ -22,20 +22,19 @@ import kotlin.coroutines.resume
 import kotlin.system.exitProcess
 
 
-@Suppress("unused")
-class UserService : IUserService.Stub {
-    @Keep
-    constructor() {
-        Log.i("UserService", "constructor")
-    }
-
-    @Keep
-    constructor(context: Context) {
-        Log.i("UserService", "constructor with Context: context=$context")
+// https://github.com/RikkaApps/Shizuku/issues/1171#issuecomment-2952442340
+@Keep
+class UserService(val context: Context) : IUserService.Stub() {
+
+    init {
+        Log.d(
+            "UserService",
+            "constructor(context=${context.packageName},pid=${android.os.Process.myPid()},uid=${android.os.Process.myUid()})"
+        )
     }
 
     override fun destroy() {
-        Log.i("UserService", "destroy")
+        Log.d("UserService", "destroy")
         exitProcess(0)
     }
 
@@ -44,6 +43,7 @@ class UserService : IUserService.Stub {
     }
 
     override fun execCommand(command: String): CommandResult {
+        Log.d("UserService", "execCommand(command=$command)")
         val process = Runtime.getRuntime().exec("sh")
         val outputStream = DataOutputStream(process.outputStream)
         val commandResult = try {
@@ -109,8 +109,23 @@ class UserService : IUserService.Stub {
         val screenshotBuffer = SurfaceControlHidden.captureDisplay(captureArgs)
         return screenshotBuffer?.asBitmap()
     }
+
+    override fun killLegacyService(): Int {
+        val pid = android.os.Process.myPid()
+        val idReg = "\\d+".toRegex()
+        val legacyPids = execCommand("ps | grep '${context.packageName}:$shizukuPsSuffix'")
+            .result.lineSequence()
+            .mapNotNull { idReg.find(it)?.value?.toInt() }
+            .filter { it != pid }.toList()
+        if (legacyPids.isNotEmpty()) {
+            execCommand(legacyPids.joinToString(";") { "kill $it" })
+        }
+        return legacyPids.size
+    }
 }
 
+private const val shizukuPsSuffix = "shizuku-user-service"
+
 private fun unbindUserService(
     serviceArgs: Shizuku.UserServiceArgs,
     connection: ServiceConnection,
@@ -166,7 +181,7 @@ suspend fun buildServiceWrapper(): UserServiceWrapper? {
     val serviceArgs = Shizuku
         .UserServiceArgs(UserService::class.componentName)
         .daemon(false)
-        .processNameSuffix("shizuku-user-service")
+        .processNameSuffix(shizukuPsSuffix)
         .debuggable(META.debuggable)
         .version(META.versionCode)
         .tag("default")