Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update major/minor from longpress sensor" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-14 18:01:48 +00:00
committed by Android (Google) Code Review
parent 3f1e0c9d5a a276827748
commit ff8bdd8808
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
View File

@@ -307,7 +307,7 @@ public class DozeTriggers implements DozeMachine.Part {
// Since the gesture won't be received by the UDFPS view, manually inject an // Since the gesture won't be received by the UDFPS view, manually inject an
// event. // event.
mAuthController.onAodInterrupt((int) screenX, (int) screenY, mAuthController.onAodInterrupt((int) screenX, (int) screenY,
rawValues[2] /* major */, rawValues[3] /* minor */); rawValues[3] /* major */, rawValues[4] /* minor */);
} else { } else {
mDozeHost.extendPulse(pulseReason); mDozeHost.extendPulse(pulseReason);
} }

5
packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
View File

@@ -236,13 +236,14 @@ public class DozeTriggersTest extends SysuiTestCase {
public void testOnSensor_Fingerprint() { public void testOnSensor_Fingerprint() {
final int screenX = 100; final int screenX = 100;
final int screenY = 100; final int screenY = 100;
final float misc = -1;
final float minor = 2f; final float minor = 2f;
final float major = 3f; final float major = 3f;
final int reason = DozeLog.REASON_SENSOR_UDFPS_LONG_PRESS; 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); mTriggers.onSensor(reason, screenX, screenY, rawValues);
verify(mHost).extendPulse(reason); 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() { private void waitForSensorManager() {