Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8312fd58 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14948898

Change-Id: If560e6383a1ca2d29bf079407998f5700a18b386
parents 8f8b22f9 ff8bdd88

packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

                }

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

+3 −2
Original line number Diff line number Diff line
@@ -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() {