Commit Graph

66763 Commits

Author SHA1 Message Date
TreeHugger Robot
56a8f90e1d Merge "Fix some heights" into rvc-dev am: da9e2099de am: e5d2689ada am: b3a96a0577 am: 768596ab0f
Change-Id: I835cac0121f145d648a72752469c31412fdf1017
2020-04-24 14:02:35 +00:00
TreeHugger Robot
768596ab0f Merge "Fix some heights" into rvc-dev am: da9e2099de am: e5d2689ada am: b3a96a0577
Change-Id: Ia25a7b5c20c59f30462edbed72677dd3030815b6
2020-04-24 13:46:49 +00:00
TreeHugger Robot
b3a96a0577 Merge "Fix some heights" into rvc-dev am: da9e2099de am: e5d2689ada
Change-Id: I9bec389ef29908f47d3c347278c3d87855b3818e
2020-04-24 13:34:25 +00:00
TreeHugger Robot
e5d2689ada Merge "Fix some heights" into rvc-dev am: da9e2099de
Change-Id: I399533fd390b5365034a26cf6a7b9c9c3065241f
2020-04-24 13:24:41 +00:00
TreeHugger Robot
da9e2099de Merge "Fix some heights" into rvc-dev 2020-04-24 13:09:47 +00:00
Robert Luo
366f233f04 Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d am: 44cc3810f3 am: be91b9dcd4 am: be30819836 am: 0260c4f0ed
Change-Id: I403b1d621096c3845a42ab038faff20670cf2800
2020-04-24 12:13:33 +00:00
Robert Luo
79de8f2a4a Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d am: 5a5c7266c8 am: 5a05ab2ef7 am: 0622c9a6fd
Change-Id: Idbdae293574114c4cab53b48d1dd9efabf7feee4
2020-04-24 12:13:18 +00:00
Robert Luo
0260c4f0ed Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d am: 44cc3810f3 am: be91b9dcd4 am: be30819836
Change-Id: Ib6bf48730584d23e77272dabb0a5c8e0889ca175
2020-04-24 12:13:13 +00:00
Robert Luo
5e3c02cba5 Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d am: 44cc3810f3 am: e2a37cf952 am: 36cb9117b1
Change-Id: I6053788987e187db510b66f1c4c123f6a7785d16
2020-04-24 12:12:59 +00:00
Robert Luo
0622c9a6fd Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d am: 5a5c7266c8 am: 5a05ab2ef7
Change-Id: Ib05a940fab7476539625a35363e98cf5bdd7d789
2020-04-24 12:03:57 +00:00
Robert Luo
36cb9117b1 Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d am: 44cc3810f3 am: e2a37cf952
Change-Id: I23f7fd6ca61ee1c72fd0db6ab8face671707b03e
2020-04-24 12:03:40 +00:00
Robert Luo
be30819836 Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d am: 44cc3810f3 am: be91b9dcd4
Change-Id: I3b7e07ddd2b98b0a8753148d32f25fac7e0a418c
2020-04-24 12:03:35 +00:00
Robert Luo
5a05ab2ef7 Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d am: 5a5c7266c8
Change-Id: I8eb9f68743d541a0ed17f7f7c5bae1e4d8489950
2020-04-24 11:51:32 +00:00
Robert Luo
be91b9dcd4 Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d am: 44cc3810f3
Change-Id: If406c84060aa339ccb86e919aa7f2c3048cb3f31
2020-04-24 11:51:32 +00:00
Robert Luo
e2a37cf952 Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d am: 44cc3810f3
Change-Id: Ia0b0c5bfc6d18d09f22f3bdae288287ea4b4285a
2020-04-24 11:51:19 +00:00
Robert Luo
5a5c7266c8 Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d
Change-Id: I1a26e35e643e1307b37f543fd80f238e94654b79
2020-04-24 11:41:37 +00:00
Robert Luo
44cc3810f3 Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d
Change-Id: Ifea3839c7b30aee374cae85adcb78ce5558d0e65
2020-04-24 11:41:23 +00:00
Robert Luo
44121a7a3d Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev 2020-04-24 11:24:30 +00:00
Robert Luo
b26b9561a1 Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems
Bug: 154561690
Test: make RunSettingsRoboTests and pass all test cases in NfcAndPaymentFragmentTest
Change-Id: I12f4901e4de01eb259f9daf3ac33b1e1879e98fd
2020-04-24 17:47:12 +08:00
TreeHugger Robot
4fc870dd60 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: 204c1bc8f5 am: 5f5e3898f5 am: 0065eb6558 am: c4ed2557b7
Change-Id: Iab8543f4df6a351ada29869139fdf83afa37bb7b
2020-04-24 09:32:01 +00:00
Automerger Merge Worker
50ce16b469 Merge "Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: beacdf9774" into rvc-d1-dev-plus-aosp am: 1012257cdc am: aba7be6d6f
Change-Id: I8a066a1184e3f80f5a1582eb904976f90369a545
2020-04-24 09:30:56 +00:00
TreeHugger Robot
628fb47526 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: 204c1bc8f5 am: 46917ef154 am: 12d2465c80
Change-Id: I414ad38d2393b995a564ac6539d07a9a1c20d3d3
2020-04-24 09:30:40 +00:00
TreeHugger Robot
c4ed2557b7 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: 204c1bc8f5 am: 5f5e3898f5 am: 0065eb6558
Change-Id: I7a3c2282aca721ef63a13f39010483895c49483f
2020-04-24 09:30:36 +00:00
Automerger Merge Worker
aba7be6d6f Merge "Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: beacdf9774" into rvc-d1-dev-plus-aosp am: 1012257cdc
Change-Id: Id5e64719ad5f2078b4b0a1818b6c7d8c99289478
2020-04-24 09:08:45 +00:00
TreeHugger Robot
12d2465c80 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: 204c1bc8f5 am: 46917ef154
Change-Id: I4f28b4ce69bbc72c86b7657459f1fcfa158898f1
2020-04-24 09:08:23 +00:00
TreeHugger Robot
0065eb6558 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: 204c1bc8f5 am: 5f5e3898f5
Change-Id: Ie9233357f644a60d0e3cdc7f86ca7e37c64d77ce
2020-04-24 09:08:08 +00:00
Automerger Merge Worker
1012257cdc Merge "Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: beacdf9774" into rvc-d1-dev-plus-aosp 2020-04-24 08:57:02 +00:00
TreeHugger Robot
f306df38f2 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: beacdf9774
Change-Id: Ic2f98d74f765f3d9f261be5a555bef218419b4ff
2020-04-24 08:56:57 +00:00
TreeHugger Robot
5f5e3898f5 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: 204c1bc8f5
Change-Id: I9d5c961c685ca498e70fb4033076e192abc3c680
2020-04-24 08:56:55 +00:00
TreeHugger Robot
46917ef154 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf am: 204c1bc8f5
Change-Id: I18fd9c5bcfd70db343fb9ecd0eefda724f47c3b7
2020-04-24 08:56:46 +00:00
TreeHugger Robot
beacdf9774 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf
Change-Id: Idb79edf5ef01ab33bcbd6625279f2eb21cd44c68
2020-04-24 08:40:06 +00:00
TreeHugger Robot
204c1bc8f5 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf
Change-Id: I061f46e5d5c3f42d8265ad490858398469f0a6b6
2020-04-24 08:40:02 +00:00
TreeHugger Robot
0a98937baf Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev 2020-04-24 08:32:55 +00:00
TreeHugger Robot
eb302d9cd0 Merge "Cast device missing from output switcher list" into rvc-dev am: c38c02eec8 am: e313fb3f87 am: 0ce5645700 am: 034454f0be am: 403babc3b9
Change-Id: I29437641a1fbb05ac05e24e8db5c60aa3fdb42b7
2020-04-24 07:27:55 +00:00
TreeHugger Robot
af4ae696db Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227 am: 1bb16670c6 am: 0a67f2b416 am: 0bbf81119a am: 7c5a8ae7bb
Change-Id: I81fc21a6b87dca91f7a229d585994c39f1c77d5a
2020-04-24 07:27:48 +00:00
TreeHugger Robot
63f0ad5f59 Merge "Cast device missing from output switcher list" into rvc-dev am: c38c02eec8 am: 6a61af8835 am: 7732407cd2 am: 4ca7241fd0
Change-Id: I996af3beeba8b684e55db09d725e559e57c3ba1b
2020-04-24 07:27:41 +00:00
Automerger Merge Worker
5e377e5060 Merge "Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227 am: ab43d59d5d" into rvc-d1-dev-plus-aosp am: b0251be0e2 am: 3eee8dc74e
Change-Id: I87d7071c9959bc3a378e8857bc285c4f6658c47c
2020-04-24 07:27:34 +00:00
TreeHugger Robot
a7773b2d68 Merge "Cast device missing from output switcher list" into rvc-dev am: c38c02eec8 am: e313fb3f87 am: c5f2e1defb am: 54b6584ff4
Change-Id: Ie78ef1abcd42da14b0a5c348cc0da3924059c86b
2020-04-24 07:27:25 +00:00
TreeHugger Robot
403babc3b9 Merge "Cast device missing from output switcher list" into rvc-dev am: c38c02eec8 am: e313fb3f87 am: 0ce5645700 am: 034454f0be
Change-Id: I8bd39d27e95ec1be9221805ddf1428eb57b27705
2020-04-24 07:26:31 +00:00
TreeHugger Robot
583682bab1 Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227 am: 1bb16670c6 am: 1292188a56 am: da8749304f
Change-Id: I4d9279221e199f136dcaf6a3bf4693aa5e512c8d
2020-04-24 07:26:24 +00:00
TreeHugger Robot
7c5a8ae7bb Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227 am: 1bb16670c6 am: 0a67f2b416 am: 0bbf81119a
Change-Id: I4ee019e2e436a2bc6e64d8c2011cb0f6918803b7
2020-04-24 07:26:22 +00:00
TreeHugger Robot
4ca7241fd0 Merge "Cast device missing from output switcher list" into rvc-dev am: c38c02eec8 am: 6a61af8835 am: 7732407cd2
Change-Id: I9cb528b4e16c0716a1f029a43c7db430c833ac71
2020-04-24 07:10:31 +00:00
Automerger Merge Worker
3eee8dc74e Merge "Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227 am: ab43d59d5d" into rvc-d1-dev-plus-aosp am: b0251be0e2
Change-Id: Ie83a4024dc8b79dd5022068be185b4f8de0085fc
2020-04-24 07:10:23 +00:00
TreeHugger Robot
034454f0be Merge "Cast device missing from output switcher list" into rvc-dev am: c38c02eec8 am: e313fb3f87 am: 0ce5645700
Change-Id: I6476e50c4cf4479ab631034a4a737eadeafbdb29
2020-04-24 07:10:15 +00:00
TreeHugger Robot
54b6584ff4 Merge "Cast device missing from output switcher list" into rvc-dev am: c38c02eec8 am: e313fb3f87 am: c5f2e1defb
Change-Id: I60634cfa1edfd14a211a129fbe4a6cf0bd1b6242
2020-04-24 07:10:15 +00:00
TreeHugger Robot
0bbf81119a Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227 am: 1bb16670c6 am: 0a67f2b416
Change-Id: I98e2d703bbd30c1b55678abdfedfeb5fc37c9fae
2020-04-24 07:10:06 +00:00
TreeHugger Robot
da8749304f Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227 am: 1bb16670c6 am: 1292188a56
Change-Id: I8ed66f17d2bc1dbfcfb0199ff36a41789320136f
2020-04-24 07:10:05 +00:00
TreeHugger Robot
7732407cd2 Merge "Cast device missing from output switcher list" into rvc-dev am: c38c02eec8 am: 6a61af8835
Change-Id: I0e1a3588203163db4e7b84bed1e481890a634fba
2020-04-24 06:53:13 +00:00
TreeHugger Robot
0ce5645700 Merge "Cast device missing from output switcher list" into rvc-dev am: c38c02eec8 am: e313fb3f87
Change-Id: I889c92ac6949a9c3b1abfab1f3a9f2acbc1209ba
2020-04-24 06:53:13 +00:00
Automerger Merge Worker
b0251be0e2 Merge "Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227 am: ab43d59d5d" into rvc-d1-dev-plus-aosp 2020-04-24 06:53:11 +00:00