summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Wright <michaelwr@google.com> 2017-09-20 15:39:44 +0000
committer android-build-merger <android-build-merger@google.com> 2017-09-20 15:39:44 +0000
commitd6ccec0d57dc091a323ec05cf5739dc24f3235f5 (patch)
treee07ffeace3f8591335fc3b1e5b0036f38f4d3dd0
parent4c6309bc0119959c210cd65b7e82c4b07bb800d4 (diff)
parentafe7a5c86c15110013ef5b05d57a76e07dc9a37f (diff)
Add TYPE_INPUT_CONSUMER to the trusted overlay list.
am: afe7a5c86c Change-Id: I842c497e97c0808d03a9b7847d921514b37f2d3b
-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,