Merge "Determine if devices support screen off unlock from config" into main (aa39f816) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

+8 −13

Original line number	Diff line number	Diff line
		@@ -681,15 +681,10 @@ public class FingerprintSettings extends SubSettings {
		return false;
		}

		private boolean isUltrasnoicUdfps() {
		mFingerprintManager = Utils.getFingerprintManagerOrNull(getActivity());
		if (mFingerprintManager != null) {
		mSensorProperties = mFingerprintManager.getSensorPropertiesInternal();
		for (FingerprintSensorPropertiesInternal prop : mSensorProperties) {
		if (prop.isUltrasonicUdfps()) {
		return true;
		}
		}
		private boolean isScreenOffUnlcokSupported() {
		if (isUdfps()) {
		return getContext().getResources().getBoolean(
		com.android.internal.R.bool.config_screen_off_udfps_enabled);
		}
		return false;
		}
		@@ -736,7 +731,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() && isUltrasnoicUdfps())) {
		if (isSfps() \|\| (screenOffUnlockUdfps() && isScreenOffUnlcokSupported())) {
		scrollToPreference(fpPrefKey);
		addFingerprintUnlockCategory();
		}
		@@ -836,7 +831,7 @@ public class FingerprintSettings extends SubSettings {
		restToUnlockPreference.getOnPreferenceChangeListener());
		}
		setupFingerprintUnlockCategoryPreferencesForScreenOnToAuth();
		} else if (screenOffUnlockUdfps() && isUltrasnoicUdfps()) {
		} else if (screenOffUnlockUdfps() && isScreenOffUnlcokSupported()) {
		setupFingerprintUnlockCategoryPreferencesForScreenOffUnlock();
		}
		setupExtFingerprintPreferences();
		@@ -905,7 +900,7 @@ public class FingerprintSettings extends SubSettings {

		private void updatePreferencesAfterFingerprintRemoved() {
		updateAddPreference();
		if (isSfps() \|\| (screenOffUnlockUdfps() && isUltrasnoicUdfps())) {
		if (isSfps() \|\| (screenOffUnlockUdfps() && isScreenOffUnlcokSupported())) {
		updateFingerprintUnlockCategoryVisibility();
		}
		updatePreferences();
		@@ -1181,7 +1176,7 @@ public class FingerprintSettings extends SubSettings {
		}

		}
		} else if (screenOffUnlockUdfps() && isUltrasnoicUdfps()) {
		} else if (screenOffUnlockUdfps() && isScreenOffUnlcokSupported()) {
		for (AbstractPreferenceController controller : controllers) {
		if (controller.getPreferenceKey() == KEY_FINGERPRINT_UNLOCK_CATEGORY) {
		mFingerprintUnlockCategoryPreferenceController =

src/com/android/settings/biometrics/fingerprint/FingerprintSettingsScreenOffUnlockUdfpsPreferenceController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ public class FingerprintSettingsScreenOffUnlockUdfpsPreferenceController
		return false;
		}
		final boolean defEnabled = mContext.getResources().getBoolean(
		com.android.internal.R.bool.config_screen_off_udfps_enabled);
		com.android.internal.R.bool.config_screen_off_udfps_default_on);
		final int value = Settings.Secure.getIntForUser(
		mContext.getContentResolver(),
		Settings.Secure.SCREEN_OFF_UNLOCK_UDFPS_ENABLED,