Merge "Disable setting if sensor is convenience." into sc-v2-dev
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsConfirmPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsConfirmPreferenceController.java
index c515742..60f8b21 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsConfirmPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsConfirmPreferenceController.java
@@ -19,13 +19,17 @@
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 @@
@Override
public int getAvailabilityStatus() {
- return AVAILABLE;
+ 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;
+ }
}
}