Merge "Count incorrect password attempts from shell." (4ad301ad) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/locksettings/LockSettingsShellCommand.java

+15 −12

Original line number	Diff line number	Diff line
		@@ -156,21 +156,24 @@ class LockSettingsShellCommand extends ShellCommand {
		getOutPrintWriter().println("Lock screen disabled set to " + disabled);
		}

		private boolean checkCredential() throws RemoteException, RequestThrottledException {
		private boolean checkCredential() throws RemoteException {
		final boolean havePassword = mLockPatternUtils.isLockPasswordEnabled(mCurrentUserId);
		final boolean havePattern = mLockPatternUtils.isLockPatternEnabled(mCurrentUserId);
		if (havePassword \|\| havePattern) {
		boolean result;
		try {
		final boolean result;
		if (havePassword) {
		result = mLockPatternUtils.checkPassword(mOld, mCurrentUserId);
		} else {
		result = mLockPatternUtils.checkPattern(stringToPattern(mOld),
		mCurrentUserId);
		result = mLockPatternUtils.checkPattern(stringToPattern(mOld), mCurrentUserId);
		}
		if (result) {
		return true;
		} else {
		if (!result) {
		mLockPatternUtils.reportFailedPasswordAttempt(mCurrentUserId);
		getOutPrintWriter().println("Old password '" + mOld + "' didn't match");
		}
		return result;
		} catch (RequestThrottledException e) {
		getOutPrintWriter().println("Request throttled");
		return false;
		}
		} else {