diff options
| author | 2021-06-14 18:01:48 +0000 | |
|---|---|---|
| committer | 2021-06-14 18:01:48 +0000 | |
| commit | ff8bdd8808ab0723ba670ee20f08d1303613fba5 (patch) | |
| tree | a32e903cb94b360b23f63d1ea807439ba569ec37 | |
| parent | 3f1e0c9d5a6779971616c9d9139cd2234de79334 (diff) | |
| parent | a276827748050f9beae62ae0812e77240a0ccc39 (diff) | |
Merge "Update major/minor from longpress sensor" into sc-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/tests/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 c45eb3558948..ff95604088ed 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 4a9d66c16003..c0b45c6d5c96 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() { |