From da3f6a15d7fbbc7c9a931683df2e4a5bb983307e Mon Sep 17 00:00:00 2001 From: Arthur Hung Date: Thu, 5 Aug 2021 02:41:20 +0000 Subject: [PATCH] Add TYPE_STATUS_BAR_ADDITIONAL to trusted overlay The TYPE_STATUS_BAR_ADDITIONAL is used to show the status bar in non conventional parts of the screen. Add it to trusted overlay or we could get FLAG_WINDOW_IS_PARTIALLY_OBSCURED when receiving touch. Bug: 194459109 Test: atest WindowInputTests AccessibilityGestureDispatchTest Change-Id: I3f41f3eeeed431309d348cc4d1286e4b346f1259 (cherry picked from commit c05be1313764a73ff40780e537802f45ba7fa491) Merged-In: I3f41f3eeeed431309d348cc4d1286e4b346f1259 --- services/core/java/com/android/server/wm/InputMonitor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java index 8c781a13f7db3..d417d56b6d316 100644 --- a/services/core/java/com/android/server/wm/InputMonitor.java +++ b/services/core/java/com/android/server/wm/InputMonitor.java @@ -39,6 +39,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; import static android.view.WindowManager.LayoutParams.TYPE_NOTIFICATION_SHADE; import static android.view.WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY; import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR; +import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_ADDITIONAL; import static android.view.WindowManager.LayoutParams.TYPE_VOICE_INTERACTION; import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; @@ -650,6 +651,7 @@ final class InputMonitor { || type == TYPE_DOCK_DIVIDER || type == TYPE_ACCESSIBILITY_OVERLAY || type == TYPE_INPUT_CONSUMER - || type == TYPE_VOICE_INTERACTION; + || type == TYPE_VOICE_INTERACTION + || type == TYPE_STATUS_BAR_ADDITIONAL; } }