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

Commit 11c76382 authored by Ilya Matyukhin's avatar Ilya Matyukhin Committed by Automerger Merge Worker
Browse files

Merge "Tighten the scope of ACTION_UDFPS_ILLUMINATE" into tm-dev am: dd14aed4 

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



Change-Id: Ia21e8cc27e6a935dafeb1a2e51cf8f564325a6b4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ef11e51 dd14aed4

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java

+1 −3
Original line number Diff line number Diff line
@@ -376,7 +376,6 @@ public class UdfpsController implements DozeReceiver { 
                boolean withinSensorArea =

                        isWithinSensorArea(udfpsView, event.getX(), event.getY(), fromUdfpsView);

                if (withinSensorArea) {

                    mLatencyTracker.onActionStart(LatencyTracker.ACTION_UDFPS_ILLUMINATE);

                    Trace.beginAsyncSection("UdfpsController.e2e.onPointerDown", 0);

                    Log.v(TAG, "onTouch | action down");

                    // The pointer that causes ACTION_DOWN is always at index 0.
@@ -792,6 +791,7 @@ public class UdfpsController implements DozeReceiver { 
                    + " current: " + mOverlay.getRequestId());

            return;

        }

        mLatencyTracker.onActionStart(LatencyTracker.ACTION_UDFPS_ILLUMINATE);



        if (!mOnFingerDown) {

            playStartHaptic();
@@ -806,11 +806,9 @@ public class UdfpsController implements DozeReceiver { 


        final UdfpsView view = mOverlay.getOverlayView();

        if (view != null) {

            Trace.beginAsyncSection("UdfpsController.e2e.startIllumination", 0);

            view.startIllumination(() -> {

                mFingerprintManager.onUiReady(requestId, mSensorProps.sensorId);

                mLatencyTracker.onActionEnd(LatencyTracker.ACTION_UDFPS_ILLUMINATE);

                Trace.endAsyncSection("UdfpsController.e2e.startIllumination", 0);

            });

        }