From a276827748050f9beae62ae0812e77240a0ccc39 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Fri, 11 Jun 2021 17:00:07 -0400
Subject: [PATCH] Update major/minor from longpress sensor

Fixes: 190815324
Test: manual, auth from AOD works
Test: atest DozeTriggersTest
Change-Id: I6d920d541a1bea427775d53cacfbda8b24d2ca1b
---
 .../SystemUI/src/com/android/systemui/doze/DozeTriggers.java | 2 +-
 .../src/com/android/systemui/doze/DozeTriggersTest.java      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
index c45eb3558948f..ff95604088ed0 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
@@ -307,7 +307,7 @@ public class DozeTriggers implements DozeMachine.Part {
                     // Since the gesture won't be received by the UDFPS view, manually inject an
                     // event.
                     mAuthController.onAodInterrupt((int) screenX, (int) screenY,
-                            rawValues[2] /* major */, rawValues[3] /* minor */);
+                            rawValues[3] /* major */, rawValues[4] /* minor */);
                 } else {
                     mDozeHost.extendPulse(pulseReason);
                 }
diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
index 4a9d66c16003b..c0b45c6d5c962 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
@@ -236,13 +236,14 @@ public class DozeTriggersTest extends SysuiTestCase {
     public void testOnSensor_Fingerprint() {
         final int screenX = 100;
         final int screenY = 100;
+        final float misc = -1;
         final float minor = 2f;
         final float major = 3f;
         final int reason = DozeLog.REASON_SENSOR_UDFPS_LONG_PRESS;
-        float[] rawValues = new float[]{screenX, screenY, minor, major};
+        float[] rawValues = new float[]{screenX, screenY, misc, major, minor};
         mTriggers.onSensor(reason, screenX, screenY, rawValues);
         verify(mHost).extendPulse(reason);
-        verify(mAuthController).onAodInterrupt(eq(screenX), eq(screenY), eq(minor), eq(major));
+        verify(mAuthController).onAodInterrupt(eq(screenX), eq(screenY), eq(major), eq(minor));
     }
 
     private void waitForSensorManager() {