Commit Graph

61172 Commits

Author SHA1 Message Date
Rubin Xu
8b17700ddf Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d am: 8d4aca50c6 am: 732276494e am: d7c504b396
Change-Id: I964ed5f22018e24a86cd990d0b4cf72ea2eca8b4
2020-03-18 19:42:23 +00:00
Rubin Xu
9c6e33d6f0 Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d am: 1d01ee0d97 am: 19f628ab39
Change-Id: I71a6f2c95adeb6f940a4cf4221ffc3d4adc309cd
2020-03-18 19:30:17 +00:00
Rubin Xu
d7c504b396 Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d am: 8d4aca50c6 am: 732276494e
Change-Id: I2975bc0e1fd1c33a30ef9532facd1d3eacc0bd5a
2020-03-18 19:30:04 +00:00
Rubin Xu
f765608b56 Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d am: 8d4aca50c6 am: 9808d41e62
Change-Id: I8441b0b24ff5831c98da67a39fda1c8a8e9890cb
2020-03-18 19:29:59 +00:00
Rubin Xu
19f628ab39 Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d am: 1d01ee0d97
Change-Id: I677703c99b318b0eec83e190a7713b90babbb56b
2020-03-18 19:15:24 +00:00
Rubin Xu
732276494e Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d am: 8d4aca50c6
Change-Id: I903b29d130cfb6581343e8cf07fd78e152ef1692
2020-03-18 19:15:20 +00:00
Rubin Xu
9808d41e62 Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d am: 8d4aca50c6
Change-Id: I2937deadc83562051747b19233548c0446787343
2020-03-18 19:15:08 +00:00
Anna Trostanetski
3f030a89c9 Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd am: c5cdb8ec58 am: c386f37f9b am: 013cc850b9
Change-Id: I0c1fac1c5cfff2aee2ca019dce319254045c15f7
2020-03-18 19:06:47 +00:00
Rubin Xu
8d4aca50c6 Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d
Change-Id: I5393bbdeaa05c60f4bd107b556bada17dd6c9726
2020-03-18 19:02:34 +00:00
Rubin Xu
1d01ee0d97 Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d
Change-Id: I6dda830e2e54011d505a70bdb8a10593dc8adbdd
2020-03-18 19:02:24 +00:00
Anna Trostanetski
f92f2779d2 Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd am: c5cdb8ec58 am: 88cea039de
Change-Id: I3be534b1e6d93b3ea5ec4d529d451a0fdc2c6f6c
2020-03-18 18:48:25 +00:00
Rubin Xu
b79e01680d Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev 2020-03-18 18:48:23 +00:00
Anna Trostanetski
ad75e96c91 Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd am: 9d653e5298 am: 038b9549a8
Change-Id: I504bfe242a278b7acbee72f6d17fefcdf9deab5c
2020-03-18 18:47:14 +00:00
Anna Trostanetski
013cc850b9 Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd am: c5cdb8ec58 am: c386f37f9b
Change-Id: I60edbcde586f43415ee376cf7405f6434df5b7bb
2020-03-18 18:37:21 +00:00
Anna Trostanetski
88cea039de Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd am: c5cdb8ec58
Change-Id: I4acea8cfd6364c546594f26ecfd2e552c7fb6e0a
2020-03-18 18:21:25 +00:00
Anna Trostanetski
c386f37f9b Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd am: c5cdb8ec58
Change-Id: I9498322c8fb64c73c07bf32561927c39bb0ae070
2020-03-18 18:20:33 +00:00
Anna Trostanetski
038b9549a8 Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd am: 9d653e5298
Change-Id: I8d94992534da7e2b971908c1e43d5cbc29f2d4d7
2020-03-18 18:20:23 +00:00
Anna Trostanetski
9d653e5298 Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd
Change-Id: I7f238ccc501bf9a359c129ab019e627eb1be16d3
2020-03-18 18:18:29 +00:00
Anna Trostanetski
c5cdb8ec58 Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd
Change-Id: Ia767e2ec4fbe88a646784290769e7bac692c8cac
2020-03-18 18:18:15 +00:00
Anna Trostanetski
49187777dd Merge "Show only listUIChanges instead of all" into rvc-dev 2020-03-18 18:15:52 +00:00
PETER LIANG
3a04848876 Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: 6acf430dfa am: 1bb9e8ea7a am: f0c85d278c
Change-Id: I35568e427baf854046e0ba3942b41aa8bb8315d2
2020-03-18 13:07:46 +00:00
PETER LIANG
57e9022ba5 Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: e0ec4b853b am: f49bf6be94
Change-Id: I57162b24e8803d29f78640886f382d8b13b85e8a
2020-03-18 12:55:38 +00:00
PETER LIANG
829edadfaf Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: 6acf430dfa am: bdf8412ec1
Change-Id: I9595f81a103d3a61f0555aed262adaf6b1bad933
2020-03-18 12:55:11 +00:00
PETER LIANG
f0c85d278c Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: 6acf430dfa am: 1bb9e8ea7a
Change-Id: Ifc1d74c3111829cf81d77c6ea155540ea7d1c075
2020-03-18 12:54:44 +00:00
PETER LIANG
1bb9e8ea7a Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: 6acf430dfa
Change-Id: If267e5c69924bbc1ea8a047f9b5db8944a6a9251
2020-03-18 12:36:02 +00:00
PETER LIANG
f49bf6be94 Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: e0ec4b853b
Change-Id: Ie487ab9124d61fad77273277ec235a14330f6e8f
2020-03-18 12:36:02 +00:00
PETER LIANG
bdf8412ec1 Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: 6acf430dfa
Change-Id: I53d67dfee3c722161244bd2bd4348cb9ec585d34
2020-03-18 12:35:53 +00:00
PETER LIANG
e0ec4b853b Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb
Change-Id: I97f07e429505e23ca5e7ff34e1f48dd635c1d780
2020-03-18 12:08:16 +00:00
PETER LIANG
6acf430dfa Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb
Change-Id: I3289e93f31d29e4bfba953e775b2097ddf776e26
2020-03-18 12:08:08 +00:00
PETER LIANG
76fb737beb Merge "Revise strings for tutorial improvement." into rvc-dev 2020-03-18 11:50:18 +00:00
Rubin Xu
397ee8b563 Do not reset incorrect password attempts after biometric authentication
For work challenges, do not reset incorrect password attempts if
challenge is resolved via biometric authentication. This is the
behaviour for personal keyguard and work challenge should be
consistent.

Bug: 139438785
Test: manual: enroll work challenge with fingerprint, set failed wipe
count (3) via TestDPC and attempt two failed attempts (via cmd
lock_settings). Resolve work challenge with fingerprint and attempt one
last failed attempt. Verify work profiel is wiped.

Change-Id: Ic64d3e44f3faa5adf8ac43db09e33c8403427990
2020-03-18 11:38:30 +00:00
Peter_Liang
8b411bfa55 Revise strings for tutorial improvement.
Bug: 148989018
Test: manual test
Change-Id: I249c5ae896123b546b028c959cd1a5404008aec3
2020-03-18 17:24:16 +08:00
TreeHugger Robot
32cac4cd56 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 am: 8212c33768 am: 7673cfa430
Change-Id: Id2fdac3d4ce632066cc65f914a5e24b5cd8ec38b
2020-03-18 06:11:05 +00:00
TreeHugger Robot
54ad6ea477 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: e281086ce3 am: a830006b74
Change-Id: I09e6aa72a3f7401ab60893b4940ad4ea8065cbf4
2020-03-18 06:01:11 +00:00
TreeHugger Robot
e6e0431e66 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 am: 5e7b076c2d
Change-Id: If4407cb7becef2baa8a868fc09f9183bd4d6a49d
2020-03-18 06:01:03 +00:00
TreeHugger Robot
7673cfa430 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 am: 8212c33768
Change-Id: I06bb2b3b3698e91f35d7bc54d798c917185fbb42
2020-03-18 06:01:02 +00:00
TreeHugger Robot
8212c33768 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186
Change-Id: Ic8f5ed6ee3132904f00e74f53259aeb274c82fed
2020-03-18 05:49:02 +00:00
TreeHugger Robot
a830006b74 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: e281086ce3
Change-Id: Ib9500d7e76796c394500717a5b1bbebf4c8a9c21
2020-03-18 05:49:02 +00:00
TreeHugger Robot
5e7b076c2d Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186
Change-Id: I7071b8d5bc3d1c1ee20b75ac92f12d532e723f14
2020-03-18 05:48:47 +00:00
TreeHugger Robot
e281086ce3 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda
Change-Id: I3ddb79684d912b7c336a6ffaf165a2a7ab1b5c06
2020-03-18 05:37:21 +00:00
TreeHugger Robot
17962d8186 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda
Change-Id: I260656236087cc7a0bff2f278a90dc7f3d52b688
2020-03-18 05:37:14 +00:00
TreeHugger Robot
a2a1056dda Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev 2020-03-18 05:22:27 +00:00
Menghan Li
f65ba41a8b Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef am: 29d33f3922 am: 6be3263f5c
Change-Id: I7c20a38db31d7b4ca891f3d6c1a53e57e19797c8
2020-03-18 01:46:20 +00:00
Menghan Li
41b3ea78ea Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: f8eb71c324 am: 699eb07df2
Change-Id: Iecf70d242ca907315132d3edf2af700f1f6e4ba7
2020-03-18 01:30:08 +00:00
Menghan Li
23627fad2b Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef am: 286d6ac7dc
Change-Id: I48e195e58f45f53a28b691dbc5a556bcb8d21da7
2020-03-18 01:30:02 +00:00
Menghan Li
6be3263f5c Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef am: 29d33f3922
Change-Id: I0717caf7787cc4ee1cfc5acac204e7753a4d2680
2020-03-18 01:29:57 +00:00
Menghan Li
699eb07df2 Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: f8eb71c324
Change-Id: Ia2401d530ea63ef972f2365dba5d31e18df49f59
2020-03-18 01:24:20 +00:00
Menghan Li
29d33f3922 Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef
Change-Id: Ia350ab892c9356a4f4aa02be26a1c28d625238cd
2020-03-18 01:18:26 +00:00
Menghan Li
286d6ac7dc Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef
Change-Id: I3773bbc143c16b62b8e6c052844b043db8a8ee0e
2020-03-18 01:18:06 +00:00
Menghan Li
f8eb71c324 Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4
Change-Id: Id7d2b3ffd27ec01ff3bc2eb8a96dcfecb857b0a3
2020-03-18 01:05:52 +00:00