OSDN Git Service

Make failed ConfirmCredential attempts count towards wipe
authorCharles He <qiurui@google.com>
Wed, 26 Apr 2017 17:45:48 +0000 (18:45 +0100)
committerCharles He <qiurui@google.com>
Tue, 23 May 2017 17:04:52 +0000 (18:04 +0100)
commit641c9fc23a54519bd6ea7972a9dd89898a84851b
treec9466fa4b4dbf302d90bb65699d536d8e1f292c8
parent5230ffe3a53a098c5d730d645418146c700ff601
Make failed ConfirmCredential attempts count towards wipe

Previously, failed ConfirmDeviceCredential attempts only counted towards the
wipe limit if it is used as a separate work challenge.

In this CL, we additionally make these failed attempts count towards the total
failures in the following scenarios:
  1) when unified work challenge is enabled
  2) for the primary user (e.g. when a wipe limit is set by a DO)
  3) for secondary users

Bug: 27238008
Test: manual, by entering wrong credentials multiple times
Test: make SettingsRoboTests
Change-Id: Ie5a099bb3fd46245c13ccf4c8f91c4d935412a4e
res/values/strings.xml
src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
src/com/android/settings/password/ConfirmLockPassword.java
src/com/android/settings/password/ConfirmLockPattern.java