summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2018-08-22 13:49:32 +0100
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-08-22 16:20:10 +0000
commit9993c5cdaca79941c61027c1525d06945d39008f (patch)
tree98eb8a06c73f8e0e19226b7fcb2d302fd55c50d9
parent86861cbb679a1859af82d6668199144ec4178069 (diff)
downloadnative-9993c5cdaca79941c61027c1525d06945d39008f.tar.gz
Fix a typo when checking a touch is within the physical frame.
Bug: 112876936 Test: enable notchless simulation, try seascape apps, try swiping down Change-Id: I8a155e16c19c474e605cb5a8d938e04461646027 (cherry picked from commit c597d61a615091f3d7176fa0cb3efc56b3dbda66)
-rw-r--r--services/inputflinger/InputReader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/inputflinger/InputReader.cpp b/services/inputflinger/InputReader.cpp
index 4c4786fea8..0b7e850452 100644
--- a/services/inputflinger/InputReader.cpp
+++ b/services/inputflinger/InputReader.cpp
@@ -6547,7 +6547,7 @@ void TouchInputMapper::cancelTouch(nsecs_t when) {
bool TouchInputMapper::isPointInsideSurface(int32_t x, int32_t y) {
const float scaledX = x * mXScale;
- const float scaledY = x * mYScale;
+ const float scaledY = y * mYScale;
return x >= mRawPointerAxes.x.minValue && x <= mRawPointerAxes.x.maxValue
&& scaledX >= mPhysicalLeft && scaledX <= mPhysicalLeft + mPhysicalWidth
&& y >= mRawPointerAxes.y.minValue && y <= mRawPointerAxes.y.maxValue