From 4ec7b5c3fbd80d38f1010631dfa84c1476f7c867 Mon Sep 17 00:00:00 2001 From: ryanlwlin Date: Thu, 4 Jun 2020 14:04:45 +0800 Subject: [PATCH] DO NOT MERGE: Map TYPE_TRUSTED_APPLICATION_OVERLAY to system window type for A11y TYPE_TRUSTED_APPLICATION_OVERLAY is a system window type used in Bubble. We map it to system window type for AccesibiltiyWindowInfo Bug: 158066152 Test: Enable bubble window and observe its type of AccessibilityWindowInfo Change-Id: I597d360a79fc61dbf4a3d713004272d33d40e576 --- .../server/accessibility/AccessibilityWindowManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java index 468e93a8f683c..d15c60b9501de 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java @@ -725,7 +725,8 @@ 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_SCREENSHOT: + case WindowManager.LayoutParams.TYPE_TRUSTED_APPLICATION_OVERLAY: { return AccessibilityWindowInfo.TYPE_SYSTEM; }