commit 2eefe69f9ed5d1199fc6ba8ab3e11efe1643f93d
author Conley Owens <cco3@android.com> Wed Apr 30 00:09:36 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 30 00:09:36 2014 +0000
tree 76a207acde9e4a200c7598b8fd1595dff309f066
parent 32ccf558cec475cb94146245c5806807ec0deb4f
parent 51eb29fa9a2ffe9c5adb9ea25bfbd51992ff16a4

Merge "Add TYPE_MAGNIFICATION_OVERLAY to isTrustedOverlay"

services/inputflinger/InputWindow.cpp

diff --git a/services/inputflinger/InputWindow.cpp b/services/inputflinger/InputWindow.cpp
index da59159..fda3ffa 100644
--- a/services/inputflinger/InputWindow.cpp
+++ b/services/inputflinger/InputWindow.cpp
@@ -43,6 +43,7 @@
 bool InputWindowInfo::isTrustedOverlay() const {
     return layoutParamsType == TYPE_INPUT_METHOD
             || layoutParamsType == TYPE_INPUT_METHOD_DIALOG
+            || layoutParamsType == TYPE_MAGNIFICATION_OVERLAY
             || layoutParamsType == TYPE_SECURE_SYSTEM_OVERLAY;
 }
 

services/inputflinger/InputWindow.h

diff --git a/services/inputflinger/InputWindow.h b/services/inputflinger/InputWindow.h
index 9618ffe..5879c84 100644
--- a/services/inputflinger/InputWindow.h
+++ b/services/inputflinger/InputWindow.h
@@ -106,6 +106,7 @@
         TYPE_NAVIGATION_BAR     = FIRST_SYSTEM_WINDOW+19,
         TYPE_VOLUME_OVERLAY = FIRST_SYSTEM_WINDOW+20,
         TYPE_BOOT_PROGRESS = FIRST_SYSTEM_WINDOW+21,
+        TYPE_MAGNIFICATION_OVERLAY = FIRST_SYSTEM_WINDOW+22,
         LAST_SYSTEM_WINDOW      = 2999,
     };