Merge "Don't trigger active unlock on udfps-down" into tm-dev am: ea4839b80c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350522 Change-Id: I3a41ee966608dc68ac71758e359b1654e990292e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -51,7 +51,6 @@ import android.view.accessibility.AccessibilityManager;
|
|||||||
|
|
||||||
import com.android.internal.annotations.VisibleForTesting;
|
import com.android.internal.annotations.VisibleForTesting;
|
||||||
import com.android.internal.util.LatencyTracker;
|
import com.android.internal.util.LatencyTracker;
|
||||||
import com.android.keyguard.ActiveUnlockConfig;
|
|
||||||
import com.android.keyguard.KeyguardUpdateMonitor;
|
import com.android.keyguard.KeyguardUpdateMonitor;
|
||||||
import com.android.systemui.animation.ActivityLaunchAnimator;
|
import com.android.systemui.animation.ActivityLaunchAnimator;
|
||||||
import com.android.systemui.broadcast.BroadcastSender;
|
import com.android.systemui.broadcast.BroadcastSender;
|
||||||
@@ -808,10 +807,6 @@ public class UdfpsController implements DozeReceiver {
|
|||||||
if (!mKeyguardUpdateMonitor.isFaceDetectionRunning()) {
|
if (!mKeyguardUpdateMonitor.isFaceDetectionRunning()) {
|
||||||
mKeyguardUpdateMonitor.requestFaceAuth(/* userInitiatedRequest */ false);
|
mKeyguardUpdateMonitor.requestFaceAuth(/* userInitiatedRequest */ false);
|
||||||
}
|
}
|
||||||
|
|
||||||
mKeyguardUpdateMonitor.requestActiveUnlock(
|
|
||||||
ActiveUnlockConfig.ACTIVE_UNLOCK_REQUEST_ORIGIN.UNLOCK_INTENT,
|
|
||||||
"udfpsFingerDown");
|
|
||||||
}
|
}
|
||||||
mOnFingerDown = true;
|
mOnFingerDown = true;
|
||||||
if (mAlternateTouchProvider != null) {
|
if (mAlternateTouchProvider != null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user