PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,343 Commits 1 Branch 0 Tags
6046dbfc6d081750f5cdcda2d2da796f64a62a5a
Commit Graph

61343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Stange
475b73ba05 Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be am: d7c3458743 
Change-Id: I274199a33e17f4a079447a5df6c653ad3db20e6b
 2020-03-18 22:16:58 +00:00
Blake Kragten
77a5a0aba2 Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400 am: ac9917a6be 
Change-Id: Ic3a3f4d89c04cf07c8eeeb50f7a5e12d4ad79b82
 2020-03-18 22:15:02 +00:00
Anthony Stange
8488fd6e51 Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be am: c984a18721 
Change-Id: Id6ac8894027d1a45c8cf74fbc922de43dd4fe438
 2020-03-18 22:13:46 +00:00
Anthony Stange
5c873f2087 Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be am: c984a18721 
Change-Id: I8d2845ce0a3fbd9126763486e89fe36968c39a3b
 2020-03-18 22:13:11 +00:00
Blake Kragten
9c5a63edd2 Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400 am: d19b162a1b 
Change-Id: I82fe7853da86b2802a1bc77fa1ddc3d2d535ec2e
 2020-03-18 22:12:02 +00:00
Blake Kragten
fd60c1bee3 Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400 am: d19b162a1b 
Change-Id: Ib4156289d781519d825cdb08d7894fd4197db8da
 2020-03-18 22:11:50 +00:00
Anthony Stange
d7c3458743 Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be 
Change-Id: I5a5af738409ba0c73ea0062e0a973702baab7f03
 2020-03-18 21:56:30 +00:00
Anthony Stange
c984a18721 Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be 
Change-Id: I70421ccd985810c8a17910b71986f12296fc65f5
 2020-03-18 21:55:15 +00:00
Anthony Stange
95975931be Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev 2020-03-18 21:52:29 +00:00
Blake Kragten
ac9917a6be Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400 
Change-Id: Ifcc874f67cc3197153789fafb1077876b0a333b1
 2020-03-18 21:51:49 +00:00
Blake Kragten
d19b162a1b Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400 
Change-Id: I5dd0af4e65117be6b5f28ee3ab91ea73a977c4fc
 2020-03-18 21:50:16 +00:00
Anthony Stange
2012e6706a Revert "Show only listUIChanges instead of all" 
Revert submission 10721220-hide

Reason for revert: Caused build breakage - b/151857606
Reverted Changes:
I7c725a1ec:Show only listUIChanges instead of all
Iec8755171:Introduce listUIChanges API for developer UI

Change-Id: I7753051b06faf1f48a818a134d1eda2500f817f8
 2020-03-18 21:33:10 +00:00
Blake Kragten
75f0bdb400 Merge "Enhanced Connectivity Enabled Default" into rvc-dev 2020-03-18 21:25:11 +00:00
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
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
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
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