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

Commit 3d5c9011 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

Merge "Disable setting if sensor is convenience." into sc-v2-dev am: 1ca42ffc am: e372b2a2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16233490

Change-Id: I32ecd37e6f3937a845ee2637b9774455a8bac81b
parents bb125913 e372b2a2
Loading
Loading
Loading
Loading
+13 −1
Original line number Diff line number Diff line
@@ -19,13 +19,17 @@ package com.android.settings.biometrics.face;
import static android.provider.Settings.Secure.FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION;

import android.content.Context;
import android.hardware.biometrics.SensorProperties;
import android.hardware.face.FaceManager;
import android.hardware.face.FaceSensorProperties;
import android.provider.Settings;

import androidx.preference.Preference;

import com.android.settings.Utils;

import java.util.List;

/**
 * Preference controller giving the user an option to always require confirmation.
 */
@@ -75,6 +79,14 @@ public class FaceSettingsConfirmPreferenceController extends FaceSettingsPrefere

    @Override
    public int getAvailabilityStatus() {
        List<FaceSensorProperties> properties = mFaceManager.getSensorProperties();
        // If a sensor is convenience, it is possible that it becomes weak or strong with
        // an update. For this reason, the sensor is conditionally unavailable.
        if (!properties.isEmpty()
                && properties.get(0).getSensorStrength() == SensorProperties.STRENGTH_CONVENIENCE) {
            return CONDITIONALLY_UNAVAILABLE;
        } else {
            return AVAILABLE;
        }
    }
}