fix: ignore a11y event from other display (#1350)

Author: lisonge

app/src/main/kotlin/li/songe/gkd/a11y/A11yRuleEngine.kt

@@ -3,6 +3,7 @@ package li.songe.gkd.a11y
 import android.accessibilityservice.AccessibilityService
 import android.graphics.Bitmap
 import android.util.Log
+import android.view.Display
 import android.view.KeyEvent
 import android.view.accessibility.AccessibilityEvent
 import android.view.accessibility.AccessibilityNodeInfo
@@ -33,6 +34,7 @@ import li.songe.gkd.shizuku.shizukuContextFlow
 import li.songe.gkd.shizuku.uiAutomationFlow
 import li.songe.gkd.store.actualBlockA11yAppList
 import li.songe.gkd.store.storeFlow
+import li.songe.gkd.util.AndroidTarget
 import li.songe.gkd.util.AutomatorModeOption
 import li.songe.gkd.util.launchTry
 import li.songe.gkd.util.runMainPost
@@ -106,6 +108,8 @@ class A11yRuleEngine(val service: A11yCommonImpl) {
     fun onA11yEvent(event: AccessibilityEvent?) {
         if (!effective) return
         if (!event.isUseful()) return
+        // 拒绝副屏无障碍事件
+        if (AndroidTarget.TIRAMISU && event.displayId != Display.DEFAULT_DISPLAY) return
         onA11yFeatEvent(event)
         if (event.eventType == CONTENT_CHANGED) {
             if (!isInteractive) return // 屏幕关闭后仍然有无障碍事件 type:2048, time:8094, app:com.miui.aod, cls:android.widget.TextView

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

@@ -21,7 +21,7 @@ class SafeActivityTaskManager(private val value: IActivityTaskManager) {
         when (HiddenApiType.getTasks) {
             1 -> value.getTasks(maxNum)
             2 -> value.getTasks(maxNum, false, false)
-            3 -> value.getTasks(maxNum, false, false, Display.INVALID_DISPLAY)
+            3 -> value.getTasks(maxNum, false, false, Display.DEFAULT_DISPLAY)
             else -> value.getTasks(maxNum)
         }
     }

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

@@ -4,6 +4,8 @@ package li.songe.gkd.shizuku
 
 import android.accessibilityservice.AccessibilityServiceInfo
 import android.accessibilityservice.AccessibilityServiceInfoHidden
+import android.app.ActivityManager
+import android.app.TaskInfoHidden
 import android.app.UiAutomation
 import android.app.UiAutomationHidden
 import android.content.pm.PackageInfo
@@ -29,3 +31,5 @@ inline val KeyEvent.casted get() = this as KeyEventHidden
 inline val MotionEvent.casted get() = this as MotionEventHidden
 
 inline val PackageInfo.casted get() = this as PackageInfoHidden
+
+inline val ActivityManager.RunningTaskInfo.casted get() = this as TaskInfoHidden

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

@@ -1,6 +1,7 @@
 package li.songe.gkd.shizuku
 
 
+import android.app.ActivityManager
 import android.content.ComponentName
 import android.content.pm.PackageManager
 import androidx.annotation.WorkerThread
@@ -125,11 +126,14 @@ class ShizukuContext(
         ) != null)
     }
 
-    fun topCpn(): ComponentName? {
-        return (activityTaskManager?.getTasks()
-            ?: activityManager?.getTasks())?.firstOrNull()?.topActivity
+    fun getTasks(maxNum: Int = 1): List<ActivityManager.RunningTaskInfo> {
+        return activityTaskManager?.getTasks(maxNum)
+            ?: activityManager?.getTasks(maxNum)
+            ?: emptyList()
     }
 
+    fun topCpn(): ComponentName? = getTasks().firstOrNull()?.topActivity
+
     init {
         if (activityTaskManager != null) {
             activityTaskManager.registerDefault()

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

@@ -4,8 +4,10 @@ import android.app.ActivityManager
 import android.app.ITaskStackListener
 import android.content.ComponentName
 import android.os.Parcel
+import android.view.Display
 import li.songe.gkd.a11y.ActivityScene
 import li.songe.gkd.a11y.updateTopActivity
+import li.songe.gkd.util.AndroidTarget
 
 object FixedTaskStackListener : ITaskStackListener.Stub() {
 
@@ -46,10 +48,18 @@ object FixedTaskStackListener : ITaskStackListener.Stub() {
     }
 
     override fun onTaskMovedToFront(taskId: Int) {
-        onTaskMovedToFrontCompat()
+        val taskInfo = shizukuContextFlow.value.getTasks().firstOrNull() ?: return
+        @Suppress("DEPRECATION")
+        if (taskInfo.id != taskId) {
+            return
+        }
+        onTaskMovedToFrontCompat(taskInfo.topActivity)
     }
 
     override fun onTaskMovedToFront(taskInfo: ActivityManager.RunningTaskInfo) {
+        if (AndroidTarget.Q && taskInfo.casted.displayId != Display.DEFAULT_DISPLAY) {
+            return
+        }
         onTaskMovedToFrontCompat(taskInfo.topActivity)
     }
 }

hidden_api/src/main/java/android/app/TaskInfoHidden.java

@@ -14,4 +14,5 @@
 @RequiresApi(Build.VERSION_CODES.Q)
 public class TaskInfoHidden {
     public Configuration configuration;
+    public int displayId;
 }