From ad1a19d9ff3ac9ab887419db6ac2c580cb4c7155 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Mon, 4 Oct 2021 21:50:31 +0000 Subject: [PATCH] DO NOT MERGE: Revert "Map TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y" This reverts commit 4ec7b5c3fbd80d38f1010631dfa84c1476f7c867. Bug: 196389741 Test: Ensure PIP windows are trusted overlays Change-Id: I49477ffd489ecbc969ab9b9310c2344ab03280e8 (cherry picked from commit 0cf0d420e18ebb88668f01595ef6acfe3b568430) --- .../server/accessibility/AccessibilityWindowManager.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java index d15c60b9501de..468e93a8f683c 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java @@ -725,8 +725,7 @@ public class AccessibilityWindowManager { case WindowManager.LayoutParams.TYPE_SYSTEM_ERROR: case WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY: case WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY: - case WindowManager.LayoutParams.TYPE_SCREENSHOT: - case WindowManager.LayoutParams.TYPE_TRUSTED_APPLICATION_OVERLAY: { + case WindowManager.LayoutParams.TYPE_SCREENSHOT: { return AccessibilityWindowInfo.TYPE_SYSTEM; }