OSDN Git Service

Fix phishing attack in ChooseLockGeneric
authorSteven Ng <stevenckng@google.com>
Mon, 15 May 2017 17:30:04 +0000 (18:30 +0100)
committerSteven Ng <stevenckng@google.com>
Mon, 15 May 2017 17:53:22 +0000 (17:53 +0000)
commit14153fd25b4757add2107d35e71fcfbb55c1e419
tree332e4573a1e90af80e22a99ff1fde3281fcf8343
parent521e705eafffa1dc449053800d6cc13bba0edffe
Fix phishing attack in ChooseLockGeneric

Cherry-pick of 436256c36d69549c77320d073bef27649c1b1d6e

Test: 1) make and run SettingsTests. It passes.
      2) Manual test 1
         a) On a device supports fingerprint, set a password but not fingerprint.
         b) adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
         c) Confirm Lock password screen is shown
         d) Select "Skip fingerprint". There isn't a second lock password confirmation screen.
         e) A new password can be set successfully.
      3) Manual test 2
         a) Repeat step 2)a) - 2)c)
         b) Select "Fingerprint + PIN". There isn't a second lock password confirmation screen.
         c) A new password and fingerprint can be enrolled successfully.

Bug: 33059280
Change-Id: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
Merged-In: I1078c6e303fc41aeeb370e5d6518d1f16b5837f1
src/com/android/settings/ChooseLockGeneric.java
tests/app/Android.mk
tests/app/src/com/android/settings/ChooseLockGenericTest.java [new file with mode: 0644]