Alex Johnston
8f75ffe0be
Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 am: d228e68e5d am: 50639850ef am: 01a52651be
...
Change-Id: Id0635766cb9c903a3803f67768d6ca4e678d095f
2020-05-01 11:10:11 +00:00
Alex Johnston
01a52651be
Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 am: d228e68e5d am: 50639850ef
...
Change-Id: I1ed2d49a2cadfe652fd519c6e69c0ee061c5194e
2020-05-01 10:58:27 +00:00
Alex Johnston
50639850ef
Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 am: d228e68e5d
...
Change-Id: I21441661c6b925fe68a13b321a75cf3c6e42730d
2020-05-01 10:45:09 +00:00
Alex Johnston
d228e68e5d
Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581
...
Change-Id: Id61362adab4df33881d0eb7d9675cbf46c2236c6
2020-05-01 10:30:55 +00:00
Alex Johnston
cf342c9581
Merge "Update work challenge header in Settings" into rvc-dev
2020-05-01 10:10:49 +00:00
Arc Wang
fbe8866938
Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 9aff7f5d0f am: 3860223c02 am: 86f48566ae am: 63c891fa03
...
Change-Id: I042d5e1d2a4b200e6d35853f6d4051af09272ffe
2020-05-01 05:57:19 +00:00
Arc Wang
63c891fa03
Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 9aff7f5d0f am: 3860223c02 am: 86f48566ae
...
Change-Id: Id7cc935ffd5df8c2730ef18610800c5b261f7a6d
2020-05-01 05:49:56 +00:00
Arc Wang
1e98d63eb6
Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 46a6ac052b am: 0ff6a0a766 am: c24d677fe1
...
Change-Id: I7d55f627552641d8bdad3aaf61c69a9150455f23
2020-05-01 05:49:53 +00:00
Arc Wang
4fb48d5d19
Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 9aff7f5d0f am: 40eb2f6d21 am: 4ba2bfbc72
...
Change-Id: Idc827915a526820fe25d3690d6036ac05c3c8a1c
2020-05-01 05:49:41 +00:00
Arc Wang
c24d677fe1
Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 46a6ac052b am: 0ff6a0a766
...
Change-Id: I704bfeee1d985a9a8670d20737230b66d04d7627
2020-05-01 05:38:03 +00:00
Arc Wang
4ba2bfbc72
Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 9aff7f5d0f am: 40eb2f6d21
...
Change-Id: Ib1a598e6826a09b35485ce521c376c10ffbaf1d7
2020-05-01 05:37:55 +00:00
Arc Wang
86f48566ae
Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 9aff7f5d0f am: 3860223c02
...
Change-Id: Ie55f5540bf57fe8a16bd6b05fab697db7795aba2
2020-05-01 05:37:36 +00:00
Arc Wang
0ff6a0a766
Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 46a6ac052b
...
Change-Id: I27cadf1b27215c540d7865da297b9a4aff2bd456
2020-05-01 05:21:46 +00:00
Arc Wang
3860223c02
Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 9aff7f5d0f
...
Change-Id: I8e1e45e0e65ecb3537317ca7b3e93229d9eccdc6
2020-05-01 05:21:36 +00:00
Arc Wang
40eb2f6d21
Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 9aff7f5d0f
...
Change-Id: Id62927c762c18569f1936bd9deb5d32b5058fa2f
2020-05-01 05:21:18 +00:00
Arc Wang
46a6ac052b
Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d
...
Change-Id: I9eda6563c28388f20c3acaf10d0d4569fccc7e7b
2020-05-01 05:06:30 +00:00
Arc Wang
9aff7f5d0f
Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d
...
Change-Id: Id77ca934c98b189bb2634b17e53ff580025fe2bd
2020-05-01 05:06:19 +00:00
Arc Wang
7e40584e5d
Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev
2020-05-01 04:52:30 +00:00
govenliu
4d74ae2e67
[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases.
...
Add new unit test cases in WifiP2pSettingsTest.java, the coverage rate will raise from 30% to 71%.
Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
Change-Id: I214866efae47a99e75178beca48deb398b70f9bd
2020-05-01 09:00:10 +08:00
Xiangyu/Malcolm Chen
1824f5be15
[automerger skipped] Merge "Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest." am: 6819a64e45 am: 30792ed811 -s ours am: 8e35cc2c37 -s ours am: 9f07b1fcc2 -s ours am: 818066d62b -s ours
...
am skip reason: Change-Id I77dfa6eb61ee7b2cf2eb4fd8d8a392a43f7035b3 with SHA-1 08cc6396b2
2020-04-30 19:11:23 +00:00
Xiangyu/Malcolm Chen
818066d62b
[automerger skipped] Merge "Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest." am: 6819a64e45 am: 30792ed811 -s ours am: 8e35cc2c37 -s ours am: 9f07b1fcc2 -s ours
...
am skip reason: Change-Id I77dfa6eb61ee7b2cf2eb4fd8d8a392a43f7035b3 with SHA-1 08cc6396b2
2020-04-30 18:36:02 +00:00
Xiangyu/Malcolm Chen
9f07b1fcc2
[automerger skipped] Merge "Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest." am: 6819a64e45 am: 30792ed811 -s ours am: 8e35cc2c37 -s ours
...
am skip reason: Change-Id I77dfa6eb61ee7b2cf2eb4fd8d8a392a43f7035b3 with SHA-1 08cc6396b2
2020-04-30 18:23:34 +00:00
Xiangyu/Malcolm Chen
8e35cc2c37
[automerger skipped] Merge "Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest." am: 6819a64e45 am: 30792ed811 -s ours
...
am skip reason: Change-Id I77dfa6eb61ee7b2cf2eb4fd8d8a392a43f7035b3 with SHA-1 08cc6396b2
2020-04-30 18:04:26 +00:00
Xiangyu/Malcolm Chen
30792ed811
Merge "Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest." am: 6819a64e45
...
Change-Id: I6e2235612a27168fc095773e0638da0c9602addd
2020-04-30 17:38:16 +00:00
TreeHugger Robot
23fc044054
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 631944fe1d am: 944fac2735 am: abbbd8ca2f am: 296b354f52
...
Change-Id: I7d54f7982e64fbffed0fe516ef6d839fb9eea4ff
2020-04-30 17:35:41 +00:00
TreeHugger Robot
29e475cc1b
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 503685b948 am: 9bdd888646 am: b2455df251
...
Change-Id: Ia388bcfa4c250079d3d5cb292efe70242530966a
2020-04-30 17:25:26 +00:00
Xiangyu/Malcolm Chen
6819a64e45
Merge "Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest."
2020-04-30 17:16:55 +00:00
TreeHugger Robot
3062c949bd
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 631944fe1d am: 45775e72b4 am: e347559116
...
Change-Id: Ie83f389a5f4935ff60777372491ae49822df5551
2020-04-30 16:58:48 +00:00
TreeHugger Robot
296b354f52
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 631944fe1d am: 944fac2735 am: abbbd8ca2f
...
Change-Id: I25b9574190301ad6f41534f461d58641994ab1d3
2020-04-30 16:58:37 +00:00
TreeHugger Robot
b2455df251
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 503685b948 am: 9bdd888646
...
Change-Id: I9724b58560cf36b12a02910eaee4a973706410f5
2020-04-30 16:41:58 +00:00
TreeHugger Robot
abbbd8ca2f
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 631944fe1d am: 944fac2735
...
Change-Id: I1318f9f1772843cfa1b4e3b27e55fc9b48d7e137
2020-04-30 16:40:37 +00:00
TreeHugger Robot
e347559116
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 631944fe1d am: 45775e72b4
...
Change-Id: If1613e7fb84be641d6f5141682e4364cfe317d8b
2020-04-30 16:40:35 +00:00
TreeHugger Robot
9bdd888646
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 503685b948
...
Change-Id: I4c601de6632493a37f4f18eb57f8ee948e81f271
2020-04-30 16:26:57 +00:00
TreeHugger Robot
944fac2735
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 631944fe1d
...
Change-Id: If0c9c0ca60ff02fdff41cd1fe8bc09f1409fa899
2020-04-30 16:26:50 +00:00
TreeHugger Robot
45775e72b4
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 631944fe1d
...
Change-Id: I3700b532220fe0a3e421b58a260bd66740e36220
2020-04-30 16:26:33 +00:00
TreeHugger Robot
503685b948
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775
...
Change-Id: I86f6aa578c2224c8069333b5ebf593b5415b1459
2020-04-30 16:07:57 +00:00
TreeHugger Robot
631944fe1d
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775
...
Change-Id: I3d8a9c7bcb1963f40be9dfd651f52df8dc0032b6
2020-04-30 16:07:39 +00:00
TreeHugger Robot
6debb6a775
Merge "Add keyword for app pinning setting" into rvc-dev
2020-04-30 15:49:19 +00:00
TreeHugger Robot
6984eb3b6f
[automerger skipped] Merge "Fix missing zone strings in some cases" into rvc-dev am: 4f244f6b88 am: 6b77190291 am: 5d31959c05 am: a2bf50fb82 -s ours am: 06e92f7a84 -s ours
...
am skip reason: Change-Id Ia89c777a832f8b41c8d56d3327a9b7370ba44b52 with SHA-1 a21962b3c9
2020-04-30 15:47:05 +00:00
Edgar Wang
6f055f0dce
Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6 am: db6bf67b32 am: 680b374dea am: 97e849fbb2 am: 8bc680c331
...
Change-Id: Ie154d5df447cc0fbe0546d1c96af5b9c759fef48
2020-04-30 15:46:11 +00:00
TreeHugger Robot
06e92f7a84
[automerger skipped] Merge "Fix missing zone strings in some cases" into rvc-dev am: 4f244f6b88 am: 6b77190291 am: 5d31959c05 am: a2bf50fb82 -s ours
...
am skip reason: Change-Id Ia89c777a832f8b41c8d56d3327a9b7370ba44b52 with SHA-1 a21962b3c9
2020-04-30 15:27:30 +00:00
Edgar Wang
8bc680c331
Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6 am: db6bf67b32 am: 680b374dea am: 97e849fbb2
...
Change-Id: I067f80c8c0398f95d419898204025f612b77a5c5
2020-04-30 15:26:56 +00:00
TreeHugger Robot
d0e48a0aec
[automerger skipped] Merge "Fix missing zone strings in some cases" into rvc-dev am: 4f244f6b88 am: 6b77190291 -s ours am: 734a147598 -s ours am: f33898e350 -s ours
...
am skip reason: Change-Id Ia89c777a832f8b41c8d56d3327a9b7370ba44b52 with SHA-1 a21962b3c9
2020-04-30 15:22:26 +00:00
Edgar Wang
db669baecc
Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6 am: db6bf67b32 am: d356187270 am: 2c36a8ff21
...
Change-Id: Ie2f51b1379b8f1fadac9ab847c04ec5165ce72c0
2020-04-30 15:21:26 +00:00
TreeHugger Robot
635ab36793
[automerger skipped] Merge "Fix missing zone strings in some cases" into rvc-dev am: 4f244f6b88 -s ours am: 53f3cdbba4 -s ours am: 18f9fdc976 -s ours am: fb9dbe5ddc -s ours
...
am skip reason: Change-Id Ia89c777a832f8b41c8d56d3327a9b7370ba44b52 with SHA-1 eafec7a244
2020-04-30 15:19:42 +00:00
Edgar Wang
e1bb2e3a86
Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6 am: 15e89819cb am: 29fea828bb am: 7bf033dc66
...
Change-Id: Iec5ecb5856ee7e33e576066113688d45e309169f
2020-04-30 15:19:00 +00:00
TreeHugger Robot
a2bf50fb82
Merge "Fix missing zone strings in some cases" into rvc-dev am: 4f244f6b88 am: 6b77190291 am: 5d31959c05
...
Change-Id: Id601ff3855dd1b75def0233ca908fc1f539e96dc
2020-04-30 15:14:36 +00:00
Edgar Wang
97e849fbb2
Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6 am: db6bf67b32 am: 680b374dea
...
Change-Id: Icfefba456a0c18a400852b75c12c48011c6c6725
2020-04-30 15:12:17 +00:00
TreeHugger Robot
f33898e350
[automerger skipped] Merge "Fix missing zone strings in some cases" into rvc-dev am: 4f244f6b88 am: 6b77190291 -s ours am: 734a147598 -s ours
...
am skip reason: Change-Id Ia89c777a832f8b41c8d56d3327a9b7370ba44b52 with SHA-1 a21962b3c9
2020-04-30 15:12:01 +00:00
Edgar Wang
2c36a8ff21
Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6 am: db6bf67b32 am: d356187270
...
Change-Id: I322219da4d9be35e475f676c136b5e13bfb89741
2020-04-30 15:09:39 +00:00
