Fix FPS pipeline: keep game detection alive outside the app screen, kill timed out Shizuku processes, quote layer names

Author: JoeBuildsThings

app/src/main/java/com/example/system/OverlayService.kt

@@ -141,6 +141,7 @@ class OverlayService : Service() {
     private fun observePreferencesAndTelemetry() {
         // Collect telemetry
         GameDeckApp.instance.telemetryManager.start(serviceScope)
+        UsageDetector.startMonitoring(applicationContext, GameDeckApp.instance.appScope)
         serviceScope.launch {
             GameDeckApp.instance.telemetryManager.telemetryFlow.collectLatest { metrics ->
                 currentMetrics.value = metrics

app/src/main/java/com/example/system/UsageDetector.kt

@@ -21,6 +21,7 @@ object UsageDetector {
     private var monitoringJob: Job? = null
     private var lastForegroundPackage: String? = null
     private var activeGamePackage: String? = null
+    private var seeded = false
 
     fun isUsagePermissionGranted(context: Context): Boolean {
         val appOps = context.getSystemService(Context.APP_OPS_SERVICE) as? AppOpsManager ?: return false
@@ -51,7 +52,7 @@ object UsageDetector {
                     val isAutoDetect = GameDeckApp.instance.repository.isAutoDetectEnabledFlow.first()
                     if (isAutoDetect && isUsagePermissionGranted(context) && usageStatsManager != null) {
                         val endTime = System.currentTimeMillis()
-                        val startTime = endTime - 3000L
+                        val startTime = if (seeded) endTime - 3000L else endTime - 120_000L
                         val events = usageStatsManager.queryEvents(startTime, endTime)
                         val event = UsageEvents.Event()
                         var latestPackage: String? = null
@@ -63,6 +64,7 @@ object UsageDetector {
                             }
                         }
 
+                        seeded = true
                         if (!latestPackage.isNullOrBlank() && latestPackage != lastForegroundPackage) {
                             handleForegroundAppChanged(context, latestPackage)
                         }

app/src/main/java/com/example/system/collectors/MetricsCollectors.kt

@@ -164,7 +164,7 @@ class FpsCollector(
         }
 
         // Query latency
-        val latencyRes = shizukuBridge.exec("dumpsys SurfaceFlinger --latency \"$layer\"", timeoutMs = 1500L)
+        val latencyRes = shizukuBridge.exec("dumpsys SurfaceFlinger --latency " + shellQuote(layer), timeoutMs = 1500L)
         if (latencyRes.isSuccess) {
             val parseResult = SurfaceFlingerParser.parseLatencyOutput(latencyRes.getOrNull() ?: "")
             if (parseResult != null) {
@@ -189,6 +189,8 @@ class FpsCollector(
         )
     }
 
+    private fun shellQuote(s: String): String = "'" + s.replace("'", "'\\''") + "'"
+
     private fun getDisplayRefreshRate(): Float {
         return try {
             val dm = context.getSystemService(Context.DISPLAY_SERVICE) as? DisplayManager

app/src/main/java/com/example/system/shizuku/ShizukuBridge.kt

@@ -183,25 +183,33 @@ class ShizukuBridge(private val context: Context) {
         val method = newProcessMethod
             ?: return@withContext Result.failure(IllegalStateException("Shizuku newProcess method unavailable"))
 
+        var process: java.lang.Process? = null
+        var timedOut = false
         try {
-            withTimeout(timeoutMs) {
-                val process = method.invoke(null, arrayOf("sh", "-c", command), null, null) as java.lang.Process
-                val reader = BufferedReader(InputStreamReader(process.inputStream))
-                val output = StringBuilder()
-                var line: String?
-                while (reader.readLine().also { line = it } != null) {
-                    output.append(line).append("\n")
-                }
-                reader.close()
-                val exitCode = process.waitFor()
-                if (exitCode == 0) {
-                    Result.success(output.toString())
-                } else {
-                    Result.failure(RuntimeException("Command failed with exit code $exitCode: $command"))
-                }
+            process = method.invoke(null, arrayOf("sh", "-c", "$command 2>/dev/null"), null, null) as java.lang.Process
+            val proc = process
+            val watchdog = launch {
+                delay(timeoutMs)
+                timedOut = true
+                proc.destroy()
+            }
+            val output = try {
+                proc.inputStream.bufferedReader().use { it.readText() }
+            } finally {
+                watchdog.cancel()
+            }
+            val exitCode = proc.waitFor()
+            if (timedOut) {
+                Result.failure<String>(RuntimeException("Command timed out after ${timeoutMs}ms: $command"))
+            } else if (exitCode == 0) {
+                Result.success(output)
+            } else {
+                Result.failure<String>(RuntimeException("Command failed with exit code $exitCode: $command"))
             }
         } catch (e: Throwable) {
-            Result.failure(e)
+            Result.failure<String>(e)
+        } finally {
+            try { process?.destroy() } catch (_: Throwable) {}
         }
     }
 

app/src/main/java/com/example/ui/MainViewModel.kt

@@ -86,7 +86,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     init {
         refreshPermissions()
         loadInstalledApps()
-        UsageDetector.startMonitoring(app, viewModelScope)
+        UsageDetector.startMonitoring(app, app.appScope)
         app.telemetryManager.start(viewModelScope)
     }