diff options
author | 2016-05-26 13:49:53 +0100 | |
---|---|---|
committer | 2016-05-26 13:49:53 +0100 | |
commit | b9be0cf397eb6053fb5b472d91cf2d6a22c6693f (patch) | |
tree | 5c2df82bd1d27113ca6a23e8599876c17a6357d4 | |
parent | 7443c1f253008acd868af1e35449dd5eb3139c8d (diff) |
Mark the multiwindow divider as a trusted overlay.
Having it be untrusted breaks the permissions granting dialog in
multiwindow mode.
Bug: 28828041
Change-Id: I9193dbce7315ebaa205673edd4f406d0b72665c8
-rw-r--r-- | services/inputflinger/InputWindow.cpp | 3 | ||||
-rw-r--r-- | services/inputflinger/InputWindow.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/services/inputflinger/InputWindow.cpp b/services/inputflinger/InputWindow.cpp index 1b913c51b3..d7b514b0b6 100644 --- a/services/inputflinger/InputWindow.cpp +++ b/services/inputflinger/InputWindow.cpp @@ -46,7 +46,8 @@ bool InputWindowInfo::isTrustedOverlay() const { || layoutParamsType == TYPE_MAGNIFICATION_OVERLAY || layoutParamsType == TYPE_STATUS_BAR || layoutParamsType == TYPE_NAVIGATION_BAR - || layoutParamsType == TYPE_SECURE_SYSTEM_OVERLAY; + || layoutParamsType == TYPE_SECURE_SYSTEM_OVERLAY + || layoutParamsType == TYPE_DOCK_DIVIDER; } bool InputWindowInfo::supportsSplitTouch() const { diff --git a/services/inputflinger/InputWindow.h b/services/inputflinger/InputWindow.h index 0ac7fce549..e243637ed8 100644 --- a/services/inputflinger/InputWindow.h +++ b/services/inputflinger/InputWindow.h @@ -102,6 +102,7 @@ struct InputWindowInfo { TYPE_VOLUME_OVERLAY = FIRST_SYSTEM_WINDOW+20, TYPE_BOOT_PROGRESS = FIRST_SYSTEM_WINDOW+21, TYPE_MAGNIFICATION_OVERLAY = FIRST_SYSTEM_WINDOW+22, + TYPE_DOCK_DIVIDER = FIRST_SYSTEM_WINDOW+34, LAST_SYSTEM_WINDOW = 2999, }; |