From 18817f3ef53d2f0aa836128d1a47679fcb462025 Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Wed, 9 Jun 2021 16:03:26 -0700 Subject: [PATCH] Fix UDFPS touch coordinates reported to the HAL Bug: 189940935 Test: HAL logs Change-Id: I4193d8a4ee21bfde49738ec7df05e4a28214ee48 --- .../com/android/systemui/biometrics/UdfpsController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java index dd339abb3a405..f975a804ca80b 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java @@ -405,9 +405,8 @@ public class UdfpsController implements DozeReceiver { ? event.getPointerId(0) : event.findPointerIndex(mActivePointerId); if (idx == event.getActionIndex()) { - final float x = event.getX(idx); - final float y = event.getY(idx); - if (isWithinSensorArea(udfpsView, x, y, fromUdfpsView)) { + if (isWithinSensorArea(udfpsView, event.getX(idx), event.getY(idx), + fromUdfpsView)) { if (mVelocityTracker == null) { // touches could be injected, so the velocity tracker may not have // been initialized (via ACTION_DOWN). @@ -427,7 +426,8 @@ public class UdfpsController implements DozeReceiver { final long sinceLastLog = SystemClock.elapsedRealtime() - mTouchLogTime; if (!isIlluminationRequested && !mGoodCaptureReceived && !exceedsVelocityThreshold) { - onFingerDown((int) x, (int) y, minor, major); + onFingerDown((int) event.getRawX(), (int) event.getRawY(), minor, + major); Log.v(TAG, "onTouch | finger down: " + touchInfo); mTouchLogTime = SystemClock.elapsedRealtime(); mPowerManager.userActivity(SystemClock.uptimeMillis(),