Enable fingerprint option in Settings [1/3] (6dd431d0) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/PackageManager.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -1640,6 +1640,12 @@ public abstract class PackageManager {
		@SdkConstant(SdkConstantType.FEATURE)
		public static final String FEATURE_GAMEPAD = "android.hardware.gamepad";

		/**
		* Feature for {@link #getSystemAvailableFeatures} and
		* {@link #hasSystemFeature}: The device is capable of reading a user's fingerprint
		* @hide
		*/
		public static final String FEATURE_FINGERPRINT = "android.hardware.fingerprint";

		/**
		* Action to external storage service to clean out removed apps.

core/java/com/android/internal/widget/LockPatternUtils.java

+100 −20

Original line number	Diff line number	Diff line
		@@ -144,11 +144,15 @@ public class LockPatternUtils {
		public final static String PATTERN_EVER_CHOSEN_KEY = "lockscreen.patterneverchosen";
		public final static String PASSWORD_TYPE_KEY = "lockscreen.password_type";
		public static final String PASSWORD_TYPE_ALTERNATE_KEY = "lockscreen.password_type_alternate";
		// More precisely defines the lock method when the password type is set to biometric_weak
		public static final String PASSWORD_BIOMETRIC_EXACT_TYPE = "lockscreen.password_biometric_type";

		public final static String LOCK_PASSWORD_SALT_KEY = "lockscreen.password_salt";
		public final static String DISABLE_LOCKSCREEN_KEY = "lockscreen.disabled";
		public final static String LOCKSCREEN_OPTIONS = "lockscreen.options";
		public final static String LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK
		= "lockscreen.biometric_weak_fallback";
		public static final String LOCKSCREEN_FINGERPRINT_FALLBACK = "lockscreen.fingerprint_fallback";
		public final static String BIOMETRIC_WEAK_EVER_CHOSEN_KEY
		= "lockscreen.biometricweakeverchosen";
		public final static String LOCKSCREEN_POWER_BUTTON_INSTANTLY_LOCKS
		@@ -167,6 +171,11 @@ public class LockPatternUtils {
		// consider it a complex PIN/password.
		public static final int MAX_ALLOWED_SEQUENCE = 3;

		// Types of weak biometric lock types
		public static final int BIOMETRIC_WEAK_UNKNOWN = -1;
		public static final int BIOMETRIC_WEAK_FACE = 0;
		public static final int BIOMETRIC_WEAK_FINGERPRINT = 1;

		private final Context mContext;
		private final ContentResolver mContentResolver;
		private DevicePolicyManager mDevicePolicyManager;
		@@ -505,10 +514,10 @@ public class LockPatternUtils {
		*/
		public void clearLock(boolean isFallback, int userHandle) {
		if(!isFallback) deleteGallery(userHandle);
		saveLockPassword(null, DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, isFallback,
		saveLockPassword(null, DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, isFallback, false,
		userHandle);
		setLockPatternEnabled(false, userHandle);
		saveLockPattern(null, isFallback, userHandle);
		saveLockPattern(null, isFallback, false, userHandle);
		setLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, userHandle);
		setLong(PASSWORD_TYPE_ALTERNATE_KEY, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED,
		userHandle);
		@@ -572,15 +581,17 @@ public class LockPatternUtils {
		* @param pattern The new pattern to save.
		*/
		public void saveLockPattern(List<LockPatternView.Cell> pattern) {
		this.saveLockPattern(pattern, false);
		this.saveLockPattern(pattern, false, false);
		}

		/**
		* Save a lock pattern.
		* @param pattern The new pattern to save.
		*/
		public void saveLockPattern(List<LockPatternView.Cell> pattern, boolean isFallback) {
		this.saveLockPattern(pattern, isFallback, getCurrentOrCallingUserId());
		public void saveLockPattern(List<LockPatternView.Cell> pattern, boolean isFallback,
		boolean isFingerprintFallback) {
		this.saveLockPattern(pattern, isFallback, isFingerprintFallback,
		getCurrentOrCallingUserId());
		}

		/**
		@@ -590,7 +601,7 @@ public class LockPatternUtils {
		* @param userId the user whose pattern is to be saved.
		*/
		public void saveLockPattern(List<LockPatternView.Cell> pattern, boolean isFallback,
		int userId) {
		boolean isFingerprintFallback, int userId) {
		try {
		getLockSettings().setLockPattern(patternToString(pattern), userId);
		DevicePolicyManager dpm = getDevicePolicyManager();
		@@ -610,17 +621,22 @@ public class LockPatternUtils {
		setBoolean(PATTERN_EVER_CHOSEN_KEY, true, userId);
		if (!isFallback) {
		deleteGallery(userId);
		setLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, userId);
		setLong(PASSWORD_TYPE_KEY,
		DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, userId);
		dpm.setActivePasswordState(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING,
		pattern.size(), 0, 0, 0, 0, 0, 0, userId);
		} else {
		setLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK, userId);
		setLong(PASSWORD_TYPE_ALTERNATE_KEY,
		DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, userId);
		if (!isFingerprintFallback) {
		setLong(PASSWORD_TYPE_KEY,
		DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK, userId);
		finishBiometricWeak(userId);
		dpm.setActivePasswordState(DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK,
		dpm.setActivePasswordState(
		DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK,
		0, 0, 0, 0, 0, 0, 0, userId);
		}
		}
		} else {
		dpm.setActivePasswordState(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, 0, 0,
		0, 0, 0, 0, 0, userId);
		@@ -795,7 +811,7 @@ public class LockPatternUtils {
		* @param quality {@see DevicePolicyManager#getPasswordQuality(android.content.ComponentName)}
		*/
		public void saveLockPassword(String password, int quality) {
		this.saveLockPassword(password, quality, false, getCurrentOrCallingUserId());
		this.saveLockPassword(password, quality, false);
		}

		/**
		@@ -807,7 +823,22 @@ public class LockPatternUtils {
		* @param isFallback Specifies if this is a fallback to biometric weak
		*/
		public void saveLockPassword(String password, int quality, boolean isFallback) {
		saveLockPassword(password, quality, isFallback, getCurrentOrCallingUserId());
		saveLockPassword(password, quality, isFallback, false);
		}

		/**
		* Save a lock password. Does not ensure that the password is as good
		* as the requested mode, but will adjust the mode to be as good as the
		* pattern.
		* @param password The password to save
		* @param quality {@see DevicePolicyManager#getPasswordQuality(android.content.ComponentName)}
		* @param isFallback Specifies if this is a fallback to biometric weak
		* @param isFingerprintFallback Specifies if this is a fallback for fingerprint
		*/
		public void saveLockPassword(String password, int quality, boolean isFallback,
		boolean isFingerprintFallback) {
		saveLockPassword(password, quality, isFallback, isFingerprintFallback,
		getCurrentOrCallingUserId());
		}

		/**
		@@ -819,7 +850,7 @@ public class LockPatternUtils {
		* @param isFallback Specifies if this is a fallback to biometric weak
		* @param userHandle The userId of the user to change the password for
		*/
		public void saveLockPassword(String password, int quality, boolean isFallback, int userHandle) {
		public void saveLockPassword(String password, int quality, boolean isFallback, boolean isFingerprintPassword, int userHandle) {
		try {
		DevicePolicyManager dpm = getDevicePolicyManager();
		if (!TextUtils.isEmpty(password)) {
		@@ -878,15 +909,18 @@ public class LockPatternUtils {
		0, 0, 0, 0, 0, 0, 0, userHandle);
		}
		} else {
		// Case where it's a fallback for biometric weak
		setLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK,
		userHandle);
		setLong(PASSWORD_TYPE_ALTERNATE_KEY, Math.max(quality, computedQuality),
		userHandle);
		if (!isFingerprintPassword) {
		// Case where it's a fallback for biometric weak
		setLong(PASSWORD_TYPE_KEY,
		DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK, userHandle);
		finishBiometricWeak(userHandle);
		dpm.setActivePasswordState(DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK,
		dpm.setActivePasswordState(
		DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK,
		0, 0, 0, 0, 0, 0, 0, userHandle);
		}
		}
		// Add the password to the password history. We assume all
		// password hashes have the same length for simplicity of implementation.
		String passwordHistory = getString(PASSWORD_HISTORY_KEY, userHandle);
		@@ -1004,6 +1038,52 @@ public class LockPatternUtils {
		return quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK;
		}

		/**
		* @return true if the lockscreen method is set to fingerprint
		* @hide
		*/
		public boolean usingFingerprint() {
		return usingFingerprint(getCurrentOrCallingUserId());
		}

		/**
		* @return true if the lockscreen method is set to fingerprint
		* @hide
		*/
		public boolean usingFingerprint(int userId) {
		int quality = (int) getLong(
		PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, userId);
		int exactType = (int) getLong(PASSWORD_BIOMETRIC_EXACT_TYPE, BIOMETRIC_WEAK_UNKNOWN);
		return quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK &&
		exactType == BIOMETRIC_WEAK_FINGERPRINT;
		}

		/**
		* @hide
		*/
		public void setUseFingerprint() {
		setUseFingerprint(getCurrentUser());
		}

		/**
		* @hide
		*/
		public void setUseFingerprint(int userId) {
		DevicePolicyManager dpm = getDevicePolicyManager();
		setLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK, userId);
		setLong(PASSWORD_BIOMETRIC_EXACT_TYPE, BIOMETRIC_WEAK_FINGERPRINT, userId);
		dpm.setActivePasswordState(DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK,
		0, 0, 0, 0, 0, 0, 0, userId);
		}

		/**
		* @return whether fingerprint is installed
		* @hide
		*/
		public boolean isFingerprintInstalled(Context context) {
		return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT);
		}

		/**
		* Deserialize a pattern.
		* @param string The pattern serialized with {@link #patternToString}

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2745,7 +2745,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		try {
		LockPatternUtils utils = new LockPatternUtils(mContext);
		if (!TextUtils.isEmpty(password)) {
		utils.saveLockPassword(password, quality, false, userHandle);
		utils.saveLockPassword(password, quality, false, false, userHandle);
		} else {
		utils.clearLock(false, userHandle);
		}