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

Merge "Gate screen off unlock UDFPS until power optimitized" into main

Browse Source
This commit is contained in:
Bill Lin
2024-11-10 14:09:50 +00:00
committed by Android (Google) Code Review
parent 04cf5dea9a 0d8d97ad48
commit 26fc990bdd
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
aconfig/settings_biometrics_integration_declarations.aconfig
View File

@@ -15,3 +15,13 @@ flag {
bug: "301226085"
}
flag {
name: "screen_off_unlock_power_optimization"
namespace: "biometrics_integration"
description: "This flag controls Whether to gate fp unlock when screen turns off feature before AOC optimized"
bug: "368465560"
metadata {
purpose: PURPOSE_BUGFIX
}
}

27
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -27,6 +27,7 @@ import static com.android.settings.Utils.isPrivateProfile;
import static com.android.settings.biometrics.BiometricEnrollBase.BIOMETRIC_AUTH_REQUEST;
import static com.android.settings.biometrics.BiometricEnrollBase.EXTRA_FROM_SETTINGS_SUMMARY;
import static com.android.settings.biometrics.BiometricEnrollBase.EXTRA_KEY_CHALLENGE;
import static com.android.settings.flags.Flags.screenOffUnlockPowerOptimization;
import android.app.Activity;
import android.app.Dialog;
@@ -600,6 +601,24 @@ public class FingerprintSettings extends SubSettings {
return false;
}
private boolean isUltrasnoicUdfps() {
// b/368465560 Gate either ultrasonic or optical UDFPS if the power do not optimized
if (!screenOffUnlockPowerOptimization()) {
return false;
}
mFingerprintManager = Utils.getFingerprintManagerOrNull(getActivity());
if (mFingerprintManager != null) {
mSensorProperties = mFingerprintManager.getSensorPropertiesInternal();
for (FingerprintSensorPropertiesInternal prop : mSensorProperties) {
if (prop.isUltrasonicUdfps()) {
return true;
}
}
}
return false;
}
protected void removeFingerprintPreference(int fingerprintId) {
String name = genKey(fingerprintId);
Log.e(TAG, "removeFingerprintPreference : " + fingerprintId);
@@ -639,7 +658,7 @@ public class FingerprintSettings extends SubSettings {
// This needs to be after setting ids, otherwise
// |mRequireScreenOnToAuthPreferenceController.isChecked| is always checking the primary
// user instead of the user with |mUserId|.
if (isSfps() || screenOffUnlockUdfps()) {
if (isSfps() || (screenOffUnlockUdfps() && isUltrasnoicUdfps())) {
scrollToPreference(fpPrefKey);
addFingerprintUnlockCategory();
}
@@ -706,7 +725,7 @@ public class FingerprintSettings extends SubSettings {
restToUnlockPreference.getOnPreferenceChangeListener());
}
setupFingerprintUnlockCategoryPreferencesForScreenOnToAuth();
} else if (screenOffUnlockUdfps()) {
} else if (screenOffUnlockUdfps() && isUltrasnoicUdfps()) {
setupFingerprintUnlockCategoryPreferencesForScreenOffUnlock();
}
updateFingerprintUnlockCategoryVisibility();
@@ -754,7 +773,7 @@ public class FingerprintSettings extends SubSettings {
private void updatePreferencesAfterFingerprintRemoved() {
updateAddPreference();
if (isSfps() || screenOffUnlockUdfps()) {
if (isSfps() || (screenOffUnlockUdfps() && isUltrasnoicUdfps())) {
updateFingerprintUnlockCategoryVisibility();
}
updatePreferences();
@@ -998,7 +1017,7 @@ public class FingerprintSettings extends SubSettings {
}
}
} else if (screenOffUnlockUdfps()) {
} else if (screenOffUnlockUdfps() && isUltrasnoicUdfps()) {
for (AbstractPreferenceController controller : controllers) {
if (controller.getPreferenceKey() == KEY_FINGERPRINT_UNLOCK_CATEGORY) {
mFingerprintUnlockCategoryPreferenceController =