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
Anna Trostanetski
377cf93e92
Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd am: c5cdb8ec58 am: c386f37f9b am: 013cc850b9 am: 3f030a89c9
...
Change-Id: Ia964dcd4a332af74aaf74a6cdb7d1ec7864bd178
2020-03-18 19:18:22 +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
d1e5b28b24
Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd am: c5cdb8ec58 am: 88cea039de am: f92f2779d2
...
Change-Id: Ib6f47ef3524ba22a7f66a1120d879b3512342827
2020-03-18 19:13:52 +00:00
Anna Trostanetski
fcc13f24f5
Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd am: 9d653e5298 am: 038b9549a8 am: ad75e96c91
...
Change-Id: I6b93e4388c00a4c79d7a2376399603bb332c17b6
2020-03-18 19:11:44 +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
Peter Wang
88afe392fc
Merge "[API Review] APIs in SubscriptionManager"
2020-03-18 18:53:15 +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
343fc6e10a
Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: 6acf430dfa am: 1bb9e8ea7a am: f0c85d278c am: 3a04848876
...
Change-Id: I651148b551d73655ee127c3e0ec1d20f5b712116
2020-03-18 13:09:01 +00:00
PETER LIANG
a992b621fe
Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: e0ec4b853b am: f49bf6be94 am: 57e9022ba5
...
Change-Id: Id056ceb682a467d12e7d6d3a30bd7902a03cf174
2020-03-18 13:08:37 +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
45c54d3dab
Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: 6acf430dfa am: bdf8412ec1 am: 829edadfaf
...
Change-Id: I40954a198da22995bdefe2ff3fe1e3579e248b78
2020-03-18 13:07:34 +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
robertluo
7f11d3f74a
Rename "Tap & pay" to "Contactless payments"
...
Fixes: 149270345
Test: manual and check if new string is applied
Change-Id: I412c5b5681a85d482541ae30faa13e904942b612
Merged-In: I412c5b5681a85d482541ae30faa13e904942b612
(cherry picked from commit 86a6cb8ead
2020-03-18 10:51:58 +00:00
TreeHugger Robot
6fb1667b60
Merge "Rename "Tap & pay" to "Contactless payments""
2020-03-18 10:41:35 +00:00
changbetty
e9f857621f
[Mainline] Use public method in SubscriptionManager for mainline
...
- getActiveSubscriptionIdList
To use getActiveSubscriptionInfoList to get subscription Id list
- getActiveSubscriptionInfoList(Z)
To use getActiveSubscriptionInfoList() instead
Bug: 144478274
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkUtilsTest
Change-Id: I4d6113561906af5c9e4ac7737aefac17c926059a
Merged-In: I4d6113561906af5c9e4ac7737aefac17c926059a
2020-03-18 10:33:39 +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
robertluo
86a6cb8ead
Rename "Tap & pay" to "Contactless payments"
...
Fixes: 149270345
Test: manual and check if new string is applied
Change-Id: I412c5b5681a85d482541ae30faa13e904942b612
2020-03-18 14:57:39 +08:00
TreeHugger Robot
3186224742
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 am: 8212c33768 am: 7673cfa430 am: 32cac4cd56
...
Change-Id: I703e30eb861ceb4eb7b8201875f7e0b4edef11c0
2020-03-18 06:11:21 +00: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
26f8f03ec3
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: e281086ce3 am: a830006b74 am: 54ad6ea477
...
Change-Id: Ic75f536a8369c62417f5784acd84242686b4d15e
2020-03-18 06:10:59 +00:00
TreeHugger Robot
f0c9ee7e39
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 am: 5e7b076c2d am: e6e0431e66
...
Change-Id: Ic11e5d15f0db219d8025062d2def6ad5c98c413e
2020-03-18 06:10:40 +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
