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

Commit 448895f3 authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge "Remove fingerprint_cancel_race_mitigation flag" into main

parents b80c2c9f b6491c15

packages/SystemUI/aconfig/systemui.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -35,16 +35,6 @@ flag { 
    }

 }



flag {

   name: "fingerprint_cancel_race_mitigation"

   namespace: "systemui"

   description: "Mitigate the race condition between KeyguardUpdateMonitor cancelling a fingerprint listening state and FingerprintManager sending the cancellation."

   bug: "398973663"

   metadata {

        purpose: PURPOSE_BUGFIX

   }

}



flag {

   name: "user_encrypted_source"

   namespace: "systemui"

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

+1 −5
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STR 
import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW;

import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_LOCKOUT;

import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN;

import static com.android.systemui.Flags.fingerprintCancelRaceMitigation;

import static com.android.systemui.Flags.glanceableHubV2;

import static com.android.systemui.Flags.simPinBouncerReset;

import static com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_OPENED;
@@ -2240,10 +2239,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, CoreSt 
        mBiometricManager = biometricManager;

        mConfigFaceAuthSupportedPosture = mContext.getResources().getInteger(

                R.integer.config_face_auth_supported_posture);

        mDefaultCancelSignalTimeout = 3000;

        if (fingerprintCancelRaceMitigation()) {

        mDefaultCancelSignalTimeout = 5000;

        }

        mFaceWakeUpTriggersConfig = faceWakeUpTriggersConfig;

        mAllowFingerprintOnOccludingActivitiesFromPackage = Arrays.stream(

                mContext.getResources().getStringArray(