Merge "Tighten the scope of ACTION_UDFPS_ILLUMINATE" into tm-dev am: dd14aed4ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17627878 Change-Id: Ia21e8cc27e6a935dafeb1a2e51cf8f564325a6b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -376,7 +376,6 @@ public class UdfpsController implements DozeReceiver {
|
|||||||
boolean withinSensorArea =
|
boolean withinSensorArea =
|
||||||
isWithinSensorArea(udfpsView, event.getX(), event.getY(), fromUdfpsView);
|
isWithinSensorArea(udfpsView, event.getX(), event.getY(), fromUdfpsView);
|
||||||
if (withinSensorArea) {
|
if (withinSensorArea) {
|
||||||
mLatencyTracker.onActionStart(LatencyTracker.ACTION_UDFPS_ILLUMINATE);
|
|
||||||
Trace.beginAsyncSection("UdfpsController.e2e.onPointerDown", 0);
|
Trace.beginAsyncSection("UdfpsController.e2e.onPointerDown", 0);
|
||||||
Log.v(TAG, "onTouch | action down");
|
Log.v(TAG, "onTouch | action down");
|
||||||
// The pointer that causes ACTION_DOWN is always at index 0.
|
// The pointer that causes ACTION_DOWN is always at index 0.
|
||||||
@@ -792,6 +791,7 @@ public class UdfpsController implements DozeReceiver {
|
|||||||
+ " current: " + mOverlay.getRequestId());
|
+ " current: " + mOverlay.getRequestId());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
mLatencyTracker.onActionStart(LatencyTracker.ACTION_UDFPS_ILLUMINATE);
|
||||||
|
|
||||||
if (!mOnFingerDown) {
|
if (!mOnFingerDown) {
|
||||||
playStartHaptic();
|
playStartHaptic();
|
||||||
@@ -806,11 +806,9 @@ public class UdfpsController implements DozeReceiver {
|
|||||||
|
|
||||||
final UdfpsView view = mOverlay.getOverlayView();
|
final UdfpsView view = mOverlay.getOverlayView();
|
||||||
if (view != null) {
|
if (view != null) {
|
||||||
Trace.beginAsyncSection("UdfpsController.e2e.startIllumination", 0);
|
|
||||||
view.startIllumination(() -> {
|
view.startIllumination(() -> {
|
||||||
mFingerprintManager.onUiReady(requestId, mSensorProps.sensorId);
|
mFingerprintManager.onUiReady(requestId, mSensorProps.sensorId);
|
||||||
mLatencyTracker.onActionEnd(LatencyTracker.ACTION_UDFPS_ILLUMINATE);
|
mLatencyTracker.onActionEnd(LatencyTracker.ACTION_UDFPS_ILLUMINATE);
|
||||||
Trace.endAsyncSection("UdfpsController.e2e.startIllumination", 0);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user