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

Commit 086473d4 authored by Pierre Barbier de Reuille's avatar Pierre Barbier de Reuille
Browse files

Use Desktop Experiences developer option flagging. 

This will allow the feature to work when the developer option is turned
on for 25Q3.

Flag: EXEMPT (flag infra)
Test: manual
Bug: 421237594
Change-Id: Ia22c75664f7966a624774405bd5794a11b7b7b3f
parent 037786ad

services/core/java/com/android/server/biometrics/PreAuthInfo.java

+7 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.os.UserManager; 
import android.util.Pair;

import android.util.Slog;

import android.view.Display;

import android.window.DesktopExperienceFlags.DesktopExperienceFlag;



import com.android.internal.R;

import com.android.server.biometrics.sensors.LockoutTracker;
@@ -65,6 +66,11 @@ class PreAuthInfo { 
    static final int BIOMETRIC_LOCKOUT_PERMANENT = 11;

    static final int BIOMETRIC_SENSOR_PRIVACY_ENABLED = 12;

    static final int MANDATORY_BIOMETRIC_UNAVAILABLE_ERROR = 13;

    private static final DesktopExperienceFlag BIOMETRIC_PROMPT_EXTERNAL_DISPLAY_FLAG =

            new DesktopExperienceFlag(

                    com.android.server.biometrics.Flags::biometricPromptExternalDisplay,

                    /* shouldOverrideByDevOption= */ false,

                    com.android.server.biometrics.Flags.FLAG_BIOMETRIC_PROMPT_EXTERNAL_DISPLAY);

    private static final String TAG = "BiometricService/PreAuthInfo";

    final boolean credentialRequested;

    // Sensors that can be used for this request (e.g. strong enough, enrolled, enabled).
@@ -399,8 +405,7 @@ class PreAuthInfo { 
            cameraPrivacyEnabled = mBiometricCameraManager.isCameraPrivacyEnabled();

        }



        if (com.android.server.biometrics.Flags.biometricPromptExternalDisplay()

                && isExternalDisplay()) {

        if (BIOMETRIC_PROMPT_EXTERNAL_DISPLAY_FLAG.isTrue() && isExternalDisplay()) {

            status = BIOMETRIC_HARDWARE_NOT_DETECTED;

            modality = TYPE_ANY_BIOMETRIC | TYPE_CREDENTIAL;

        } else if (mBiometricRequested && credentialRequested) {