perf: synchronized lastFront

Author: lisonge

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

@@ -51,13 +51,13 @@ class SafeActivityManager(private val value: IActivityManager) {
 
     fun registerDefault() {
         safeInvokeShizuku {
-            value.registerTaskStackListener(SafeTaskListener.instance)
+            value.registerTaskStackListener(FixedTaskStackListener)
         }
     }
 
     fun unregisterDefault() {
         safeInvokeShizuku {
-            value.unregisterTaskStackListener(SafeTaskListener.instance)
+            value.unregisterTaskStackListener(FixedTaskStackListener)
         }
     }
 }

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

@@ -6,10 +6,6 @@ import android.content.ContextHidden
 import android.view.Display
 import li.songe.gkd.util.AndroidTarget
 
-object SafeTaskListener {
-    val instance by lazy { FixedTaskStackListener() }
-}
-
 class SafeActivityTaskManager(private val value: IActivityTaskManager) {
     companion object {
         fun newBinder() = if (AndroidTarget.Q) {
@@ -46,13 +42,13 @@ class SafeActivityTaskManager(private val value: IActivityTaskManager) {
 
     fun registerDefault() {
         safeInvokeShizuku {
-            value.registerTaskStackListener(SafeTaskListener.instance)
+            value.registerTaskStackListener(FixedTaskStackListener)
         }
     }
 
     fun unregisterDefault() {
         safeInvokeShizuku {
-            value.unregisterTaskStackListener(SafeTaskListener.instance)
+            value.unregisterTaskStackListener(FixedTaskStackListener)
         }
     }
 }

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

@@ -4,12 +4,10 @@ import android.app.ActivityManager
 import android.app.ITaskStackListener
 import android.content.ComponentName
 import android.os.Parcel
-import kotlinx.atomicfu.atomic
-import kotlinx.atomicfu.updateAndGet
 import li.songe.gkd.a11y.ActivityScene
 import li.songe.gkd.a11y.updateTopActivity
 
-class FixedTaskStackListener : ITaskStackListener.Stub() {
+object FixedTaskStackListener : ITaskStackListener.Stub() {
 
     // https://github.com/gkd-kit/gkd/issues/941#issuecomment-2784035441
     override fun onTransact(code: Int, data: Parcel, reply: Parcel?, flags: Int): Boolean = try {
@@ -20,16 +18,11 @@ class FixedTaskStackListener : ITaskStackListener.Stub() {
 
     override fun onTaskStackChanged() {
         val cpn = shizukuContextFlow.value.topCpn() ?: return
-        if (lastFront.value.first > 0) {
-            val t = System.currentTimeMillis()
-            val skip = defaultFront === lastFront.updateAndGet {
-                if (it.first > 0 && t - it.first < 200 && it.second == cpn) {
-                    defaultFront
-                } else {
-                    it
-                }
+        synchronized(this) {
+            if (lastFront.first > 0 && lastFront.second == cpn && System.currentTimeMillis() - lastFront.first > 200) {
+                lastFront = defaultFront
+                return
             }
-            if (skip) return
         }
         updateTopActivity(
             appId = cpn.packageName,
@@ -39,10 +32,12 @@ class FixedTaskStackListener : ITaskStackListener.Stub() {
     }
 
     private val defaultFront = 0L to ComponentName("", "")
-    private val lastFront = atomic(defaultFront)
+    private var lastFront = defaultFront
     private fun onTaskMovedToFrontCompat(cpn: ComponentName? = null) {
         val cpn = cpn ?: shizukuContextFlow.value.topCpn() ?: return
-        lastFront.value = System.currentTimeMillis() to cpn
+        synchronized(this) {
+            lastFront = System.currentTimeMillis() to cpn
+        }
         updateTopActivity(
             appId = cpn.packageName,
             activityId = cpn.className,