OSDN Git Service

Prevent factory reset for short passwords in CryptKeeper
authorPaul Crowley <paulcrowley@google.com>
Fri, 7 Nov 2014 08:52:57 +0000 (00:52 -0800)
committerPaul Crowley <paulcrowley@google.com>
Sat, 8 Nov 2014 01:43:45 +0000 (01:43 +0000)
commit2555e5f1040984a3422c5a4db43421e87d4ca0ce
tree158e1755b83d16d7f1d2944029915ca60785d752
parentc44ad35e51db79721821817e1b8e52dce632d2bf
Prevent factory reset for short passwords in CryptKeeper

Since patterns and passwords can't be shorter than 4
elements, we shouldn't count them against attempts to unlock
the device.  If we do, we risk resetting the device
due to stray input.

Bug: 18211475
Bug: 18273380

Change-Id: Ib329cd3383471483cda68bfac4278b17d0c09c57

Conflicts:
src/com/android/settings/CryptKeeper.java
src/com/android/settings/CryptKeeper.java