commit dac43d296fa4c7302c4e626bc24094cf82ea043d
author android-build-team Robot <android-build-team-robot@google.com> Thu Sep 28 00:10:52 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Sep 28 00:10:52 2017 +0000
tree acd5c5c9148c9e14d5f69e3d7db8ca3b7166dea5
parent 9726a8d5cdb9508ec68449a494e6257201ae7576
parent 678c43cd471cc19e022649b4d6c5aadeca2931f7

Merge cherrypicks of [2969924, 2969794, 2969773, 2970233, 2969774, 2969730, 2969731, 2969795, 2969796, 2969797, 2969798, 2969799, 2970191, 2970192, 2970193, 2970194, 2970195, 2970196, 2970197, 2969421, 2969422, 2969423, 2969496, 2969900, 2969564] into nyc-bugfix-release

Change-Id: Id4db34c80fbf2a490dfd4e472a9281e6e8ed256f

services/inputflinger/InputDispatcher.cpp

diff --git a/services/inputflinger/InputDispatcher.cpp b/services/inputflinger/InputDispatcher.cpp
index 3f69d49..e48c53a 100644
--- a/services/inputflinger/InputDispatcher.cpp
+++ b/services/inputflinger/InputDispatcher.cpp
@@ -1224,15 +1224,8 @@
 
                 if (maskedAction == AMOTION_EVENT_ACTION_DOWN
                         && (flags & InputWindowInfo::FLAG_WATCH_OUTSIDE_TOUCH)) {
-                    int32_t outsideTargetFlags = InputTarget::FLAG_DISPATCH_AS_OUTSIDE;
-                    if (isWindowObscuredAtPointLocked(windowHandle, x, y)) {
-                        outsideTargetFlags |= InputTarget::FLAG_WINDOW_IS_OBSCURED;
-                    } else if (isWindowObscuredLocked(windowHandle)) {
-                        outsideTargetFlags |= InputTarget::FLAG_WINDOW_IS_PARTIALLY_OBSCURED;
-                    }
-
                     mTempTouchState.addOrUpdateWindow(
-                            windowHandle, outsideTargetFlags, BitSet32(0));
+                            windowHandle, InputTarget::FLAG_DISPATCH_AS_OUTSIDE, BitSet32(0));
                 }
             }
         }