summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2017-09-19 20:19:39 +0100
committerMichael Wright <michaelwr@google.com>2017-09-19 20:19:39 +0100
commitafe7a5c86c15110013ef5b05d57a76e07dc9a37f (patch)
tree13236784309ff4544ec273937de90a0e470aedfb
parent9c2336c0b3032de472bdf35cb5f69efcdc3b4aa9 (diff)
downloadnative-afe7a5c86c15110013ef5b05d57a76e07dc9a37f.tar.gz
Add TYPE_INPUT_CONSUMER to the trusted overlay list.
Without this, PIP will break a bunch of apps since its frame fills the whole screen, even though the application is restricted to its stackbounds (which are the size of the touch region, not the frame region). Bug: 65606046 Test: None Change-Id: Id7035dace30db37c5a58c66339d0749550a362e5
-rw-r--r--services/inputflinger/InputWindow.cpp3
-rw-r--r--services/inputflinger/InputWindow.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/services/inputflinger/InputWindow.cpp b/services/inputflinger/InputWindow.cpp
index b54752b08b..3ae7972779 100644
--- a/services/inputflinger/InputWindow.cpp
+++ b/services/inputflinger/InputWindow.cpp
@@ -49,7 +49,8 @@ bool InputWindowInfo::isTrustedOverlay() const {
|| layoutParamsType == TYPE_NAVIGATION_BAR_PANEL
|| layoutParamsType == TYPE_SECURE_SYSTEM_OVERLAY
|| layoutParamsType == TYPE_DOCK_DIVIDER
- || layoutParamsType == TYPE_ACCESSIBILITY_OVERLAY;
+ || layoutParamsType == TYPE_ACCESSIBILITY_OVERLAY
+ || layoutParamsType == TYPE_INPUT_CONSUMER;
}
bool InputWindowInfo::supportsSplitTouch() const {
diff --git a/services/inputflinger/InputWindow.h b/services/inputflinger/InputWindow.h
index 610290b2e2..9eb27983cd 100644
--- a/services/inputflinger/InputWindow.h
+++ b/services/inputflinger/InputWindow.h
@@ -101,6 +101,7 @@ struct InputWindowInfo {
TYPE_NAVIGATION_BAR = FIRST_SYSTEM_WINDOW+19,
TYPE_VOLUME_OVERLAY = FIRST_SYSTEM_WINDOW+20,
TYPE_BOOT_PROGRESS = FIRST_SYSTEM_WINDOW+21,
+ TYPE_INPUT_CONSUMER = FIRST_SYSTEM_WINDOW+22,
TYPE_NAVIGATION_BAR_PANEL = FIRST_SYSTEM_WINDOW+24,
TYPE_MAGNIFICATION_OVERLAY = FIRST_SYSTEM_WINDOW+27,
TYPE_ACCESSIBILITY_OVERLAY = FIRST_SYSTEM_WINDOW+32,