Merge \\"Fix vulnerability in LockSettings service\\" into nyc-mr1-dev am: 6ad9c16ffd (6097da89) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -371,7 +371,7 @@ public class LockPatternUtils {
		return false;
		}
		} catch (RemoteException re) {
		return true;
		return false;
		}
		}

		@@ -464,7 +464,7 @@ public class LockPatternUtils {
		return false;
		}
		} catch (RemoteException re) {
		return true;
		return false;
		}
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -1243,6 +1243,10 @@ public class LockSettingsService extends ILockSettings.Stub {
		private VerifyCredentialResponse doVerifyPattern(String pattern, CredentialHash storedHash,
		boolean hasChallenge, long challenge, int userId,
		ICheckCredentialProgressCallback progressCallback) throws RemoteException {

		if (TextUtils.isEmpty(pattern)) {
		throw new IllegalArgumentException("Pattern can't be null or empty");
		}
		boolean shouldReEnrollBaseZero = storedHash != null && storedHash.isBaseZeroPattern;

		String patternToVerify;
		@@ -1340,6 +1344,9 @@ public class LockSettingsService extends ILockSettings.Stub {
		private VerifyCredentialResponse doVerifyPassword(String password, CredentialHash storedHash,
		boolean hasChallenge, long challenge, int userId,
		ICheckCredentialProgressCallback progressCallback) throws RemoteException {
		if (TextUtils.isEmpty(password)) {
		throw new IllegalArgumentException("Password can't be null or empty");
		}
		return verifyCredential(userId, storedHash, password, hasChallenge, challenge,
		new CredentialUtil() {
		@Override