OSDN Git Service

Fix phishing attack in ChooseLockGeneric
authorSteven Ng <stevenckng@google.com>
Mon, 15 May 2017 17:30:04 +0000 (18:30 +0100)
committerkuantung <kuantung@google.com>
Thu, 25 May 2017 23:28:48 +0000 (16:28 -0700)
commit179f0e9512100b0a403aab8b2b4cf5510bb20bee
treef62c3e7d1db4260064947eed2e52553b3aa8a1f4
parent4af8f912aa1ee714638d0f9694d6f856bc8166f3
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
(cherry picked from commit 14153fd25b4757add2107d35e71fcfbb55c1e419)
(cherry picked from commit 21e0e3ddce7a5c3ed649251f390e05ac91d47c41)
src/com/android/settings/ChooseLockGeneric.java
tests/app/Android.mk
tests/app/src/com/android/settings/ChooseLockGenericTest.java [new file with mode: 0644]