Automerger Merge Worker
5b22ce17d2
Merge "Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: ee755aa059 am: 0bfc77b409" into rvc-qpr-dev-plus-aosp am: 12b02c1d47 am: 52f5cc5c83
...
Change-Id: I10cecf2c4d584804367e98523e7244295f9ceb75
2020-05-07 08:56:52 +00:00
Automerger Merge Worker
cd37c42f66
Merge "Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: a46c391290" into rvc-d1-dev-plus-aosp am: 1da1e1ffd2 am: 9b09e9877f am: abeab29c5c
...
Change-Id: I7737781e6cf7fd4b71844181f24426f6bf7d7b1a
2020-05-07 08:56:45 +00:00
Kevin Maurin
dd157c2871
Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6 am: 637a3ba98f am: b890ed1585 am: 2702c9854c am: 633986bade
...
Change-Id: I1f1b2df340f5f26cd9a60e490d35941778f1c5b6
2020-05-07 08:56:38 +00:00
TreeHugger Robot
0f3851d348
Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: ee755aa059 am: e2db16a44d am: e3ac2ebb4c am: d3db94ab0e
...
Change-Id: I5edbca43778530e08deb97046fab60633b34c46e
2020-05-07 08:56:31 +00:00
Automerger Merge Worker
52f5cc5c83
Merge "Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: ee755aa059 am: 0bfc77b409" into rvc-qpr-dev-plus-aosp am: 12b02c1d47
...
Change-Id: I8ea26c1df0619211ff15be0a8d842bce7baa1fba
2020-05-07 08:45:07 +00:00
Automerger Merge Worker
abeab29c5c
Merge "Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: a46c391290" into rvc-d1-dev-plus-aosp am: 1da1e1ffd2 am: 9b09e9877f
...
Change-Id: I73e1fcd39dcbb71196ed0feca39ee989ef296cdb
2020-05-07 08:44:59 +00:00
Kevin Maurin
633986bade
Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6 am: 637a3ba98f am: b890ed1585 am: 2702c9854c
...
Change-Id: I8df5851f3d845c16207dc7dccdbac8e2a59b54bc
2020-05-07 08:44:51 +00:00
TreeHugger Robot
d3db94ab0e
Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: ee755aa059 am: e2db16a44d am: e3ac2ebb4c
...
Change-Id: Id3cdd5772a23470f506a790f1e2cc264f4ee7f1d
2020-05-07 08:44:32 +00:00
Automerger Merge Worker
12b02c1d47
Merge "Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: ee755aa059 am: 0bfc77b409" into rvc-qpr-dev-plus-aosp
2020-05-07 08:25:53 +00:00
TreeHugger Robot
5c8c8d5067
Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: ee755aa059 am: 0bfc77b409
...
Change-Id: I32179b8cc0d83895614c36ef0fb4d0b822d16c08
2020-05-07 08:25:47 +00:00
Automerger Merge Worker
9b09e9877f
Merge "Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: a46c391290" into rvc-d1-dev-plus-aosp am: 1da1e1ffd2
...
Change-Id: I4257530170e27eb0f378ee2c20ac6989f6abd399
2020-05-07 08:25:46 +00:00
Kevin Maurin
2702c9854c
Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6 am: 637a3ba98f am: b890ed1585
...
Change-Id: Iba4048252df8dd9b4741b91c64145604aa4ebe1a
2020-05-07 08:25:38 +00:00
TreeHugger Robot
e3ac2ebb4c
Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: ee755aa059 am: e2db16a44d
...
Change-Id: I514bccef9d11106069df573dc1d2d6f4fddd84b9
2020-05-07 08:25:24 +00:00
Automerger Merge Worker
1da1e1ffd2
Merge "Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: a46c391290" into rvc-d1-dev-plus-aosp
2020-05-07 08:05:04 +00:00
TreeHugger Robot
da259b456c
Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: a46c391290
...
Change-Id: I754a17581609ce1a160c6b1eb2d05b1ed51dccf9
2020-05-07 08:05:00 +00:00
Kevin Maurin
b890ed1585
Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6 am: 637a3ba98f
...
Change-Id: Ie6e40209428eb4efb0c631e01484629b87a278bb
2020-05-07 08:04:58 +00:00
TreeHugger Robot
0bfc77b409
Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: ee755aa059
...
Change-Id: Iabc0a24ce26bb01af6084c05eee4bdda21ac987a
2020-05-07 08:04:56 +00:00
TreeHugger Robot
e2db16a44d
Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: ee755aa059
...
Change-Id: I5f20a30532f42f208b3f54a3ee7959ac29e9a238
2020-05-07 08:04:47 +00:00
Kevin Maurin
637a3ba98f
Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6
...
Change-Id: Idd58f6a25ec91775be52e64766df90fba87cde30
2020-05-07 07:25:34 +00:00
TreeHugger Robot
a46c391290
Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653
...
Change-Id: I72bcb5f87ef542de83de5c7366ec82be10ff1480
2020-05-07 07:25:31 +00:00
TreeHugger Robot
ee755aa059
Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653
...
Change-Id: Ie641bd25dffe9efeaaf25aa73edf30d80a3972e9
2020-05-07 07:25:23 +00:00
Kevin Maurin
56cefaf3d6
Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev
2020-05-07 07:20:57 +00:00
TreeHugger Robot
a76a871653
Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev
2020-05-07 07:11:32 +00:00
Amit Mahajan
d61728f929
[automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-d1-dev-plus-aosp am: fb93e94d96 am: ec5f9b1a06 -s ours am: 4b24985607 -s ours
...
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 46ada586e2
2020-05-07 07:06:53 +00:00
Amit Mahajan
4b24985607
[automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-d1-dev-plus-aosp am: fb93e94d96 am: ec5f9b1a06 -s ours
...
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 46ada586e2
2020-05-07 06:50:48 +00:00
Amit Mahajan
ec5f9b1a06
Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-d1-dev-plus-aosp am: fb93e94d96
...
Change-Id: I77a5fe0cabed8e5934ec42b4ae0c8476c19163ac
2020-05-07 06:36:01 +00:00
Bonian Chen
27828e0306
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: 034f54b351 am: 70537e6699 am: 411e488c2f am: f3d277f7b6
...
Change-Id: Ifde8d9b7cdf022880e34828a39a2e6e023258882
2020-05-07 06:13:10 +00:00
Bonian Chen
91378a3918
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: 034f54b351 am: 0e72c5acfd am: c0b7f51746 am: 7b4a0be7aa
...
Change-Id: If7ab64114f6b51f557dba3a92c524fccd201c39f
2020-05-07 06:12:39 +00:00
Bonian Chen
869c90037e
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: cc6375e61d am: 1070fd9eab am: 4a6d6d3999 am: 78ebcb372a
...
Change-Id: I319ec938af60b2e32351e3b492b9ffd016bbfd95
2020-05-07 06:12:02 +00:00
Amit Mahajan
fb93e94d96
Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-d1-dev-plus-aosp
2020-05-07 06:09:06 +00:00
Bonian Chen
f3d277f7b6
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: 034f54b351 am: 70537e6699 am: 411e488c2f
...
Change-Id: Iaa6a24e036d3fac43fa26e57695adb99b464bc50
2020-05-07 05:56:48 +00:00
Bonian Chen
7b4a0be7aa
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: 034f54b351 am: 0e72c5acfd am: c0b7f51746
...
Change-Id: I20953a1e64ca2a8f979386ee25a4e3b109dba461
2020-05-07 05:56:05 +00:00
Bonian Chen
411e488c2f
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: 034f54b351 am: 70537e6699
...
Change-Id: I2507690009ec1f332d8bf68adbb0866120cb3222
2020-05-07 05:55:59 +00:00
Bonian Chen
78ebcb372a
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: cc6375e61d am: 1070fd9eab am: 4a6d6d3999
...
Change-Id: Ic1aaeeb35cfd81dca7dacb7d088b84c87e95066b
2020-05-07 05:55:14 +00:00
Bonian Chen
c0b7f51746
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: 034f54b351 am: 0e72c5acfd
...
Change-Id: I7810f1182d3b8340fe3a2ca8e6f2fe25fa571dd8
2020-05-07 05:38:30 +00:00
Bonian Chen
4a6d6d3999
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: cc6375e61d am: 1070fd9eab
...
Change-Id: Ie05f8e27f57a940619149373c737ae825520b5b5
2020-05-07 05:38:05 +00:00
Bonian Chen
70537e6699
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: 034f54b351
...
Change-Id: I14d5001743021e81c889b634ac0912d1b9b4a213
2020-05-07 05:24:38 +00:00
Bonian Chen
0e72c5acfd
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: 034f54b351
...
Change-Id: I30155807fafb91a5ea6e65c7ffe181a6241749d6
2020-05-07 05:24:38 +00:00
Bonian Chen
1070fd9eab
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: cc6375e61d
...
Change-Id: I8ab7ac27b88fe10008490196587d22aef53daa1d
2020-05-07 05:22:04 +00:00
Bonian Chen
cc6375e61d
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a
...
Change-Id: Ifc2f3a614b42cb04bfeb3bd4123db0fca6fc0a3a
2020-05-07 05:07:09 +00:00
Bonian Chen
034f54b351
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a
...
Change-Id: I3aff01da1dc0e29b0da818784ee44f3b7a58c7bc
2020-05-07 05:06:56 +00:00
Bonian Chen
3a132d7c9a
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev
2020-05-07 04:48:02 +00:00
Kevin Maurin
cabe76debc
Display "Android Auto" in Connected Devices summary text.
...
Android Auto will be exposing a Settings tile under Connected Devices -> Connection Preferences.
If the Setting tile is available, then the summary text will reflect that.
Tested with additional unit tests and manually validated the scenarios by
flashing crosshatch-eng and disabling/enabling the relevant features.
Fix: 153896447
Test: Added unit coverage for new scenarios
Test: make RunSettingsRoboTests
Test: manually verified by flashing crosshatch-eng and disabling/enabling relevant components
Change-Id: I5a129c41b98ba435bc159a72c9a7c2dfd646ecd3
2020-05-06 21:42:43 -07:00
govenliu
1e0d40f2bd
[Wi-Fi] Enhance Wifi Settings unit test cases.
...
Add new unit test cases in
1. WifiP2pSettingsTest.java
2. WifiConfigController2Test.java
3. WifiP2PPreferenceControllerTest.java
4. WifiP2pPeerTest.java
the coverage rate of
1. com.android.settings.wifi will raise from 44% to 45%
2. com.android.settings.wifi.P2p will raise from 69% to 85%
Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pPeerTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2PPreferenceControllerTest
Change-Id: I365494e1654376b23b08f18b1a799ffc59323a4c
2020-05-07 12:13:02 +08:00
tim peng
ed5b791b9e
Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1 am: 7e5970daf1 am: 52d7bf422a am: 82024ee55d am: 8861c6084e
...
Change-Id: I14ed45ac2367eed069af31f6f4ee8f49b6de7999
2020-05-07 03:51:45 +00:00
tim peng
3e0804a410
Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1 am: c5531ce6e8 am: 4b53d13866 am: 3e2d7e444a am: c535d77089
...
Change-Id: I06dbeda37e4443ba9fca67c3ba0614456aadd252
2020-05-07 03:50:55 +00:00
tim peng
9c8a5d5577
Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1 am: c5531ce6e8 am: d9370a1e27 am: 143db43ff4 am: d499737462
...
Change-Id: I7817c84c82ec454306887be89ec9fdafc0d31737
2020-05-07 03:50:04 +00:00
tim peng
8861c6084e
Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1 am: 7e5970daf1 am: 52d7bf422a am: 82024ee55d
...
Change-Id: I1b72cbfa968ea593af3605764b27ac108fcabe95
2020-05-07 03:29:22 +00:00
tim peng
c535d77089
Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1 am: c5531ce6e8 am: 4b53d13866 am: 3e2d7e444a
...
Change-Id: Ic9dc0bc68251e58c4e82e595f066d6d39c27c649
2020-05-07 03:28:16 +00:00
tim peng
d499737462
Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1 am: c5531ce6e8 am: d9370a1e27 am: 143db43ff4
...
Change-Id: I345f7f76088d9667515da8133315d74c6348e25a
2020-05-07 03:27:11 +00:00
