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

Merge "Fix searching condition for biometric settings" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-06 05:37:08 +00:00
committed by Android (Google) Code Review
parent 8caef2218c ecd1495977
commit a75ba398fe
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/biometrics/combination/BiometricFaceStatusPreferenceController.java
View File

@@ -32,6 +32,6 @@ public class BiometricFaceStatusPreferenceController extends FaceStatusPreferenc
@Override @Override
protected boolean isDeviceSupported() { protected boolean isDeviceSupported() {
return Utils.hasFaceHardware(mContext); return Utils.isMultipleBiometricsSupported(mContext) && Utils.hasFaceHardware(mContext);
} }
} }

3
src/com/android/settings/biometrics/combination/BiometricFingerprintStatusPreferenceController.java
View File

@@ -33,6 +33,7 @@ public class BiometricFingerprintStatusPreferenceController extends
@Override @Override
protected boolean isDeviceSupported() { protected boolean isDeviceSupported() {
return Utils.hasFingerprintHardware(mContext); return Utils.isMultipleBiometricsSupported(mContext)
&& Utils.hasFingerprintHardware(mContext);
} }
} }

3
src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceController.java
View File

@@ -69,6 +69,9 @@ public class BiometricSettingsAppPreferenceController extends TogglePreferenceCo
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
if (!Utils.isMultipleBiometricsSupported(mContext)) {
return UNSUPPORTED_ON_DEVICE;
}
if (mFaceManager == null || mFingerprintManager == null) { if (mFaceManager == null || mFingerprintManager == null) {
return AVAILABLE_UNSEARCHABLE; return AVAILABLE_UNSEARCHABLE;
} }

4
src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceController.java
View File

@@ -21,6 +21,7 @@ import android.app.admin.DevicePolicyManager;
import android.content.Context; import android.content.Context;
import android.provider.Settings; import android.provider.Settings;
import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -62,6 +63,9 @@ public class BiometricSettingsKeyguardPreferenceController extends TogglePrefere
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
if (!Utils.isMultipleBiometricsSupported(mContext)) {
return UNSUPPORTED_ON_DEVICE;
}
return getRestrictingAdmin() != null ? DISABLED_FOR_USER : AVAILABLE; return getRestrictingAdmin() != null ? DISABLED_FOR_USER : AVAILABLE;
} }
} }