Merge changes from topic "presubmit-am-a097d19b46714d919133992650772d7d" into tm-mainline-prod

* changes:
  [automerge] Tighten the scope of ACTION_UDFPS_ILLUMINATE 2p: 78ac57b034
  Tighten the scope of ACTION_UDFPS_ILLUMINATE
This commit is contained in:
Ilya Matyukhin
2022-04-07 03:14:01 +00:00
committed by Android (Google) Code Review

View File

@@ -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);
});
}