PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I9a4e565b311d7a65091aca5294879366b9399265
This commit is contained in:
Joshua Mccloskey
2021-12-01 17:19:04 +00:00
committed by Automerger Merge Worker
parent 3042f4621d 1ca42ffc79
commit e372b2a22b
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/biometrics/face/FaceSettingsConfirmPreferenceController.java
View File

@@ -19,13 +19,17 @@ package com.android.settings.biometrics.face;
import static android.provider.Settings.Secure.FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION; import static android.provider.Settings.Secure.FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION;
import android.content.Context; import android.content.Context;
import android.hardware.biometrics.SensorProperties;
import android.hardware.face.FaceManager; import android.hardware.face.FaceManager;
import android.hardware.face.FaceSensorProperties;
import android.provider.Settings; import android.provider.Settings;
import androidx.preference.Preference; import androidx.preference.Preference;
import com.android.settings.Utils; import com.android.settings.Utils;
import java.util.List;
/** /**
* Preference controller giving the user an option to always require confirmation. * Preference controller giving the user an option to always require confirmation.
*/ */
@@ -75,6 +79,14 @@ public class FaceSettingsConfirmPreferenceController extends FaceSettingsPrefere
@Override @Override
public int getAvailabilityStatus() { 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;
}
} }
} }