summaryrefslogtreecommitdiffstats
path: root/services/inputflinger/InputWindow.h
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-06-07 10:10:09 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-06-07 10:10:09 -0700
commit508eb7749a4ce988d4d1a97377254add24b9bc40 (patch)
tree9f14950e50cde8816d07350fb645011d5da57377 /services/inputflinger/InputWindow.h
parent6500d428ce816ffa0ba099221a4987ad7bfcb4ab (diff)
parent03a53d1c7765eeb3af0bc34c3dff02ada1953fbf (diff)
downloadframeworks_native-508eb7749a4ce988d4d1a97377254add24b9bc40.zip
frameworks_native-508eb7749a4ce988d4d1a97377254add24b9bc40.tar.gz
frameworks_native-508eb7749a4ce988d4d1a97377254add24b9bc40.tar.bz2
Merge tag 'android-6.0.1_r46' into HEAD
Android 6.0.1 release 46 # gpg: Signature made Mon 06 Jun 2016 10:38:23 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
Diffstat (limited to 'services/inputflinger/InputWindow.h')
-rw-r--r--services/inputflinger/InputWindow.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/inputflinger/InputWindow.h b/services/inputflinger/InputWindow.h
index 42457ce..0ac7fce 100644
--- a/services/inputflinger/InputWindow.h
+++ b/services/inputflinger/InputWindow.h
@@ -146,6 +146,8 @@ struct InputWindowInfo {
bool isTrustedOverlay() const;
bool supportsSplitTouch() const;
+
+ bool overlaps(const InputWindowInfo* other) const;
};