Commit Graph

61261 Commits

Author SHA1 Message Date
TreeHugger Robot
b757cdbe07 Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d am: dde6e031f7 am: 9e94fc6afa
Change-Id: Ifaaea085c25dd1a464442db3ccd676283d15640b
2020-03-19 03:23:00 +00:00
TreeHugger Robot
09ed274f05 [automerger skipped] Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d am: 97cc247663 -s ours
am skip reason: Change-Id I412c5b5681a85d482541ae30faa13e904942b612 with SHA-1 7f11d3f74a is in history

Change-Id: I95b0e51c6cf838c395fa330e14561e45fa535739
2020-03-19 03:12:49 +00:00
TreeHugger Robot
56cd70f100 Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d am: dde6e031f7
Change-Id: I311015bab8db333bb1f87a7cfe436d4cfe5e48fa
2020-03-19 03:12:47 +00:00
TreeHugger Robot
9e94fc6afa Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d am: dde6e031f7
Change-Id: Id7287ffa053c08817c3c4f5ba71dea3ab649a21f
2020-03-19 03:12:28 +00:00
TreeHugger Robot
97cc247663 Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d
Change-Id: Icad20acd12a7bf4e2ee9f95c389c590e3d458071
2020-03-19 02:52:30 +00:00
TreeHugger Robot
dde6e031f7 Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d
Change-Id: Id07e6022613be6dd8a34d25d1004bb15fe52b0cd
2020-03-19 02:52:01 +00:00
TreeHugger Robot
c114c5b59d Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev 2020-03-19 02:36:55 +00:00
Treehugger Robot
325d9aeab4 [automerger skipped] Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" am: 84fab912b0 am: e18b79d22d -s ours am: 9bbd35b576 -s ours am: 1b4e1dc57e -s ours
am skip reason: Change-Id I5aecfa4b5a8e371b914573ddd080acb98078bfca with SHA-1 3e0f661f11 is in history

Change-Id: If74482eeecc39bc35a725d8c0f6dd5b237cd086a
2020-03-19 02:14:48 +00:00
Treehugger Robot
1b4e1dc57e [automerger skipped] Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" am: 84fab912b0 am: e18b79d22d -s ours am: 9bbd35b576 -s ours
am skip reason: Change-Id I5aecfa4b5a8e371b914573ddd080acb98078bfca with SHA-1 3e0f661f11 is in history

Change-Id: I1f8a784778d0130c683d9d759cee3cf266b8ae08
2020-03-19 02:06:59 +00:00
Tim Peng
650eda307b Close panel when media stop
-Add forceClose callback to finish panel
-Add test cases

Bug: 151396986
Test: make -j50 RunSettingsRoboTests
Change-Id: Ic0ac2880a4ff412382816ccb41b4fbb60dbdf519
2020-03-19 10:02:35 +08:00
Treehugger Robot
9bbd35b576 [automerger skipped] Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" am: 84fab912b0 am: e18b79d22d -s ours
am skip reason: Change-Id I5aecfa4b5a8e371b914573ddd080acb98078bfca with SHA-1 3e0f661f11 is in history

Change-Id: Ibe2c542a784ff8309de5fd6a370050d5a0aed8bd
2020-03-19 01:46:07 +00:00
Treehugger Robot
e18b79d22d Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" am: 84fab912b0
Change-Id: I95089501349894acad9e09b4417c74657a906722
2020-03-19 01:37:20 +00:00
Treehugger Robot
84fab912b0 Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" 2020-03-19 01:36:09 +00:00
Anthony Stange
169c7fd25a Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be am: c984a18721 am: 8488fd6e51 am: 88e410a984
Change-Id: Ib8bc59daba665261e067fee5d1e080d38de734ba
2020-03-18 22:51:09 +00:00
Blake Kragten
1b4de75a53 Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400 am: d19b162a1b am: fd60c1bee3 am: 054662536a
Change-Id: I8afcaea9cd954b27ca5e458017dc034646c981b3
2020-03-18 22:49:58 +00:00
Anthony Stange
baa739925b Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be am: d7c3458743 am: 475b73ba05
Change-Id: I4cadf2485dc52ed762236d17e5dde18d0b31e8af
2020-03-18 22:38:18 +00:00
Blake Kragten
6dc95f05aa Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400 am: ac9917a6be am: 77a5a0aba2
Change-Id: I877df384dfee0596c235ec588c42ac7aa791ebe4
2020-03-18 22:35:34 +00:00
Anthony Stange
6f2143fa1c Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be am: c984a18721 am: 5c873f2087
Change-Id: I9d52aace2471d92691174f282e78c9005ded0805
2020-03-18 22:35:16 +00:00
Blake Kragten
ac1478c9ce Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400 am: d19b162a1b am: 9c5a63edd2
Change-Id: I1f9657de4e91c6bf914514cafda31976d3be07c0
2020-03-18 22:33:29 +00:00
Anthony Stange
88e410a984 Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be am: c984a18721 am: 8488fd6e51
Change-Id: I7f7760799eec2cf731641c45d5dc5c7cb423f425
2020-03-18 22:30:53 +00:00
Blake Kragten
054662536a Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400 am: d19b162a1b am: fd60c1bee3
Change-Id: I625db0e64a2517ec30bfc48d439c78bb76c21a89
2020-03-18 22:29:05 +00:00
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