commit 466cdea8d2de302f6be4d9f59816dd2c6078decf
author Joshua Tsuji <tsuji@google.com> Mon May 04 13:53:00 2020 -0400
committer Josh Tsuji <tsuji@google.com> Thu May 07 21:58:36 2020 +0000
tree 6d7e5ac12712d991e1c06b7e081e58675e5a4f5f
parent 7e838c2377a42907783d9de7aaa6e16b7d085a3f

Make TYPE_TRUSTED_APPLICATION_OVERLAY a trusted overlay.

Test: accept a permission dialog while bubbles are there too
Fixes: 149320322
Change-Id: I3767e2d93d0bcb216483a12d94ffb13ca0051c7e

include/input/InputWindow.h

diff --git a/include/input/InputWindow.h b/include/input/InputWindow.h
index 856c54d..c5e56fd 100644
--- a/include/input/InputWindow.h
+++ b/include/input/InputWindow.h
@@ -108,6 +108,7 @@
         TYPE_ACCESSIBILITY_OVERLAY = FIRST_SYSTEM_WINDOW + 32,
         TYPE_DOCK_DIVIDER = FIRST_SYSTEM_WINDOW + 34,
         TYPE_NOTIFICATION_SHADE = FIRST_SYSTEM_WINDOW + 40,
+        TYPE_TRUSTED_APPLICATION_OVERLAY = FIRST_SYSTEM_WINDOW + 42,
         LAST_SYSTEM_WINDOW = 2999,
     };
 

libs/input/InputWindow.cpp

diff --git a/libs/input/InputWindow.cpp b/libs/input/InputWindow.cpp
index b27b050..85a2015 100644
--- a/libs/input/InputWindow.cpp
+++ b/libs/input/InputWindow.cpp
@@ -42,6 +42,7 @@
             && y >= frameTop && y < frameBottom;
 }
 
+// TODO(b/155781676): Remove and replace call points with trustedOverlay when that is ready.
 bool InputWindowInfo::isTrustedOverlay() const {
     return layoutParamsType == TYPE_INPUT_METHOD || layoutParamsType == TYPE_INPUT_METHOD_DIALOG ||
             layoutParamsType == TYPE_MAGNIFICATION_OVERLAY || layoutParamsType == TYPE_STATUS_BAR ||
@@ -51,7 +52,8 @@
             layoutParamsType == TYPE_SECURE_SYSTEM_OVERLAY ||
             layoutParamsType == TYPE_DOCK_DIVIDER ||
             layoutParamsType == TYPE_ACCESSIBILITY_OVERLAY ||
-            layoutParamsType == TYPE_INPUT_CONSUMER;
+            layoutParamsType == TYPE_INPUT_CONSUMER ||
+            layoutParamsType == TYPE_TRUSTED_APPLICATION_OVERLAY;
 }
 
 bool InputWindowInfo::supportsSplitTouch() const {