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

Commit 71c854d0 authored by Beverly's avatar Beverly
Browse files

Update lock icon falsing to use long tap falsing 

Test: manually long press with swiping and see
that log press on the lock icon doesn't trigger
Test: manually long press lock icon
and see that it doesn't false
Fixes: 276310140

Change-Id: Ia38507f158bcc4d06ae25b67b5be3efba179793a
parent c9350f83

packages/SystemUI/src/com/android/keyguard/LockIconViewController.java

+1 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static android.hardware.biometrics.BiometricSourceType.FINGERPRINT; 
import static com.android.keyguard.LockIconView.ICON_FINGERPRINT;

import static com.android.keyguard.LockIconView.ICON_LOCK;

import static com.android.keyguard.LockIconView.ICON_UNLOCK;

import static com.android.systemui.classifier.Classifier.LOCK_ICON;

import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInOffset;

import static com.android.systemui.flags.Flags.DOZING_MIGRATION_1;

import static com.android.systemui.util.kotlin.JavaAdapterKt.collectFlow;
@@ -694,7 +693,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 


    private void onLongPress() {

        cancelTouches();

        if (mFalsingManager.isFalseTouch(LOCK_ICON)) {

        if (mFalsingManager.isFalseLongTap(FalsingManager.LOW_PENALTY)) {

            Log.v(TAG, "lock icon long-press rejected by the falsing manager.");

            return;

        }

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

+1 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import static android.hardware.biometrics.BiometricOverlayConstants.REASON_ENROL 
import static android.hardware.biometrics.BiometricOverlayConstants.REASON_ENROLL_FIND_SENSOR;



import static com.android.internal.util.Preconditions.checkNotNull;

import static com.android.systemui.classifier.Classifier.LOCK_ICON;

import static com.android.systemui.classifier.Classifier.UDFPS_AUTHENTICATION;



import android.content.BroadcastReceiver;
@@ -983,7 +982,7 @@ public class UdfpsController implements DozeReceiver, Dumpable { 
        }



        if (!mKeyguardUpdateMonitor.isFingerprintDetectionRunning()) {

            if (mFalsingManager.isFalseTouch(LOCK_ICON)) {

            if (mFalsingManager.isFalseLongTap(FalsingManager.LOW_PENALTY)) {

                Log.v(TAG, "aod lock icon long-press rejected by the falsing manager.");

                return;

            }

packages/SystemUI/src/com/android/systemui/classifier/Classifier.java

+0 −3
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ public abstract class Classifier { 
    public static final int SHADE_DRAG = 11;

    public static final int QS_COLLAPSE = 12;

    public static final int UDFPS_AUTHENTICATION = 13;

    public static final int LOCK_ICON = 14;

    public static final int QS_SWIPE_SIDE = 15;

    public static final int BACK_GESTURE = 16;

    public static final int QS_SWIPE_NESTED = 17;
@@ -58,12 +57,10 @@ public abstract class Classifier { 
            GENERIC,

            BOUNCER_UNLOCK,

            PULSE_EXPAND,

            BRIGHTNESS_SLIDER,

            SHADE_DRAG,

            QS_COLLAPSE,

            BRIGHTNESS_SLIDER,

            UDFPS_AUTHENTICATION,

            LOCK_ICON,

            QS_SWIPE_SIDE,

            QS_SWIPE_NESTED,

            BACK_GESTURE,

packages/SystemUI/src/com/android/systemui/classifier/DiagonalClassifier.java

+1 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.systemui.classifier; 
import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.BRIGHTLINE_FALSING_DIAGONAL_HORIZONTAL_ANGLE_RANGE;

import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.BRIGHTLINE_FALSING_DIAGONAL_VERTICAL_ANGLE_RANGE;

import static com.android.systemui.classifier.Classifier.LEFT_AFFORDANCE;

import static com.android.systemui.classifier.Classifier.LOCK_ICON;

import static com.android.systemui.classifier.Classifier.RIGHT_AFFORDANCE;



import android.provider.DeviceConfig;
@@ -73,8 +72,7 @@ class DiagonalClassifier extends FalsingClassifier { 
        }



        if (interactionType == LEFT_AFFORDANCE

                || interactionType == RIGHT_AFFORDANCE

                || interactionType == LOCK_ICON) {

                || interactionType == RIGHT_AFFORDANCE) {

            return Result.passed(0);

        }

packages/SystemUI/src/com/android/systemui/classifier/DistanceClassifier.java

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ class DistanceClassifier extends FalsingClassifier { 
                || interactionType == SHADE_DRAG

                || interactionType == QS_COLLAPSE

                || interactionType == Classifier.UDFPS_AUTHENTICATION

                || interactionType == Classifier.LOCK_ICON

                || interactionType == Classifier.QS_SWIPE_SIDE

                || interactionType == QS_SWIPE_NESTED) {

            return Result.passed(0);