Arc Wang
a0877cd303
Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab
am: a5852f43db
am: bf73fdc64a
am: e919405e1d
am: 8b01342ff5
...
Change-Id: I6716c5888c06bcc74d111318147d88cd4deea516
2020-03-26 09:33:22 +00:00
Arc Wang
8b01342ff5
Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab
am: a5852f43db
am: bf73fdc64a
am: e919405e1d
...
Change-Id: I599f994e88746090e2d23506b9eae2e213e62ec7
2020-03-26 09:32:51 +00:00
Arc Wang
299caf4b8c
Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab
am: a5852f43db
am: b81a72522e
am: 1e492384a0
...
Change-Id: I8f41b2eb44f7aa718d4a154a2fe9e379b99f7765
2020-03-26 09:32:43 +00:00
Arc Wang
a0f09d6362
Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab
am: f6fe32971f
am: ea10d71cee
am: 10728b63a8
...
Change-Id: I91476713f3aeecd6c3e619564e2e363d6a7c4a9a
2020-03-26 09:32:14 +00:00
Arc Wang
1e492384a0
Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab
am: a5852f43db
am: b81a72522e
...
Change-Id: I271cbbec9aff873bf6403628b55c852561cb55ae
2020-03-26 09:20:04 +00:00
Arc Wang
10728b63a8
Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab
am: f6fe32971f
am: ea10d71cee
...
Change-Id: Ia054bb070a9bea9c50f6700bdf8878964a08b022
2020-03-26 09:19:43 +00:00
Arc Wang
e919405e1d
Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab
am: a5852f43db
am: bf73fdc64a
...
Change-Id: I99c1eb5d132302d8e9bb445b3b85c791f284bc88
2020-03-26 09:19:14 +00:00
Arc Wang
b81a72522e
Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab
am: a5852f43db
...
Change-Id: If56aafde70b9e77ffbe360c540aed4aecf5eeec8
2020-03-26 09:06:21 +00:00
Arc Wang
ea10d71cee
Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab
am: f6fe32971f
...
Change-Id: I7142c068dec1fefc46df6bf8236f883f378c5523
2020-03-26 09:05:48 +00:00
Arc Wang
bf73fdc64a
Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab
am: a5852f43db
...
Change-Id: I3e9efe2798de0f02f5dcafdad82ed889966236ec
2020-03-26 09:05:46 +00:00
Arc Wang
f6fe32971f
Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab
...
Change-Id: Ic5a663d485d0660bed0451a4aec31f46527c8bf5
2020-03-26 08:42:58 +00:00
Arc Wang
a5852f43db
Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab
...
Change-Id: I26626866efd6779ef17964b0efff32f2b36bd84b
2020-03-26 08:42:47 +00:00
Arc Wang
bfcb8058ab
Merge "Disable metered preference in details page if unable to change" into rvc-dev
2020-03-26 08:33:39 +00:00
TreeHugger Robot
c224e4c84b
Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712
am: 0dcef519de
am: fcc478c8af
am: 6ff9a84398
am: 3967088e03
...
Change-Id: I6c23228fcd315ecbe852ddfee4542fe5f2a11700
2020-03-26 06:08:54 +00:00
TreeHugger Robot
946f6c325c
Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712
am: fee338d8a1
am: e8a39aef59
am: bbeff815ad
...
Change-Id: Ie3e8ef8f1fdc69d14e503b2aa4c8abd6b87f8756
2020-03-26 06:08:40 +00:00
TreeHugger Robot
3967088e03
Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712
am: 0dcef519de
am: fcc478c8af
am: 6ff9a84398
...
Change-Id: I3440950cda53f4ab19d9550ef20fc546c90412d7
2020-03-26 06:08:28 +00:00
TreeHugger Robot
778f3de13f
Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712
am: 0dcef519de
am: 525a986b38
am: b7ce9d8e3b
...
Change-Id: Ib260e880248afc3086468b752eddcf9fee951e3a
2020-03-26 06:08:24 +00:00
TreeHugger Robot
bbeff815ad
Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712
am: fee338d8a1
am: e8a39aef59
...
Change-Id: I989e12f3961b33fc4d7ecd37a628e3df56cc5b14
2020-03-26 05:50:58 +00:00
TreeHugger Robot
b7ce9d8e3b
Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712
am: 0dcef519de
am: 525a986b38
...
Change-Id: Ia9b2a3befcc15583dbf7547b812aec71016a5a70
2020-03-26 05:50:39 +00:00
TreeHugger Robot
6ff9a84398
Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712
am: 0dcef519de
am: fcc478c8af
...
Change-Id: I3a2f104232744842fb8da18d0749710954dac4eb
2020-03-26 05:50:38 +00:00
TreeHugger Robot
fcc478c8af
Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712
am: 0dcef519de
...
Change-Id: I15f3d766f13866805c5cf0bb70c12b6a0a45236b
2020-03-26 05:32:28 +00:00
TreeHugger Robot
e8a39aef59
Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712
am: fee338d8a1
...
Change-Id: I15995e42123cfa45a0d4f43da202d7f8734b0977
2020-03-26 05:32:23 +00:00
TreeHugger Robot
525a986b38
Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712
am: 0dcef519de
...
Change-Id: Icaf77247994234f5f70e11aca05161734074140a
2020-03-26 05:32:12 +00:00
TreeHugger Robot
0dcef519de
Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712
...
Change-Id: Ia0a0b185195ac6710b24ff2d4a0e7673bb2b2a58
2020-03-26 05:21:16 +00:00
TreeHugger Robot
fee338d8a1
Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712
...
Change-Id: I02996d3ae6179cc37409d79134139fbed4798ccf
2020-03-26 05:21:10 +00:00
TreeHugger Robot
ef84083712
Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev
2020-03-26 05:03:03 +00:00
Arc Wang
c41bcb5576
Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f
am: 45aa81bc52
am: f0715dfcbd
am: 12b662c34b
am: 5d1d39416c
...
Change-Id: Idcbfa13f9e9f2fc866cdb3c8ab0a196b773c18df
2020-03-26 04:04:22 +00:00
Arc Wang
a76bb84fa3
Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f
am: 9e06b953fb
am: b0a29ed370
am: f7e4812e35
...
Change-Id: I99d4d229ff78357c946650d76ed9be99f901caa4
2020-03-26 04:04:10 +00:00
Arc Wang
5d1d39416c
Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f
am: 45aa81bc52
am: f0715dfcbd
am: 12b662c34b
...
Change-Id: I140e97c7af43cd8e7ba1b8dc185475f1e6dcaf0f
2020-03-26 04:03:47 +00:00
Arc Wang
76740afba2
Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f
am: 45aa81bc52
am: 1beb4afce7
am: 2dba198a1b
...
Change-Id: I65cd00ac3768263d283b7691f1e392eaebeff66b
2020-03-26 04:03:32 +00:00
Arc Wang
f7e4812e35
Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f
am: 9e06b953fb
am: b0a29ed370
...
Change-Id: Id0bc2302f14ca59ddc55af044a66bbd4caf10a98
2020-03-26 03:51:59 +00:00
Arc Wang
2dba198a1b
Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f
am: 45aa81bc52
am: 1beb4afce7
...
Change-Id: Icaf756d202a6d322f3fa8a8d4ae8745e088eab87
2020-03-26 03:51:35 +00:00
Arc Wang
12b662c34b
Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f
am: 45aa81bc52
am: f0715dfcbd
...
Change-Id: I802469ae67afe53622f6d4156f69bd1dd8437eae
2020-03-26 03:51:34 +00:00
Arc Wang
b0a29ed370
Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f
am: 9e06b953fb
...
Change-Id: I176ea096825b06f6dd4319948118bab4346bb373
2020-03-26 03:36:14 +00:00
Arc Wang
f0715dfcbd
Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f
am: 45aa81bc52
...
Change-Id: Ib1b34a836fcd02b625270d2603c2599e09dd1f8d
2020-03-26 03:35:57 +00:00
Arc Wang
1beb4afce7
Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f
am: 45aa81bc52
...
Change-Id: I97225fc67bccc252a2adb078bdce9a2eed1bd0f1
2020-03-26 03:35:50 +00:00
Arc Wang
9e06b953fb
Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f
...
Change-Id: I1473a6583f392f6bfcb9da85a3335e0be6cb3406
2020-03-26 03:19:48 +00:00
Arc Wang
45aa81bc52
Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f
...
Change-Id: I6eb5c0ff3e8a2ee6081e501530bffaa43f7ccb8f
2020-03-26 03:19:34 +00:00
Arc Wang
249f629b22
[Wi-Fi] Remove @Ignore unit tests
...
Remove @Ignore in these objects:
ConfigureWifiSettingsTest
TetherServiceTest.java
WifiTetherSecurityPreferenceControllerTest.java
WifiSettings2Test
Bug: 151696220
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I19bdc251d76161218454c1b5f58421efab33cec0
2020-03-26 11:18:27 +08:00
Arc Wang
b3c16d5d4f
Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev
2020-03-26 03:07:33 +00:00
TreeHugger Robot
05effc18a2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0747e57f25
-s ours am: 7b0240898e
-s ours am: b1a06b07ff
-s ours am: b73e5cd1f8
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I8839b6a4dfb1f502cfe63b28308c2c2753cf78ab
2020-03-26 01:26:40 +00:00
TreeHugger Robot
e3ffaee9b8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0747e57f25
-s ours am: bf13b7193b
-s ours am: 8fac7079ee
-s ours am: 348a113f29
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I7e05cf7b09d37a5d080130e3a152aed8e33eedfc
2020-03-26 01:24:21 +00:00
TreeHugger Robot
a5b0f7c348
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0747e57f25
-s ours am: 7b0240898e
-s ours am: c7e9a41c3d
-s ours am: 3b57d68796
-s ours am: cc9c582847
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Iea0ff907e70b728bb65cb41aeaa73dc5ba5d12f3
2020-03-26 01:17:50 +00:00
TreeHugger Robot
b73e5cd1f8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0747e57f25
-s ours am: 7b0240898e
-s ours am: b1a06b07ff
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I7b6a0a569c0cdce5ed7f902f08f7a43cdfd8f916
2020-03-26 00:58:39 +00:00
TreeHugger Robot
348a113f29
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0747e57f25
-s ours am: bf13b7193b
-s ours am: 8fac7079ee
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ifdb02ccf9518bd8a2b14cfc4e6a886ea135107c1
2020-03-26 00:56:15 +00:00
TreeHugger Robot
cc9c582847
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0747e57f25
-s ours am: 7b0240898e
-s ours am: c7e9a41c3d
-s ours am: 3b57d68796
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib66c30aa53aa13899c8292782d3e615f444eeb25
2020-03-26 00:54:17 +00:00
TreeHugger Robot
3b57d68796
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0747e57f25
-s ours am: 7b0240898e
-s ours am: c7e9a41c3d
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I0b9182bf1b8283e9370c35cfd93f1af74de19617
2020-03-26 00:33:31 +00:00
Quang Luong
b9b09b0474
Disable metered preference in details page if unable to change
...
Wifi networks that cannot change their metered preference (such as
suggested networks) should have their metered preference in the network
details page greyed out and unselectable.
Bug: 151159939
Test: manual - build and visual verification
Change-Id: I8507cd6f39bed5e32884fbf667dffb3f330d8b56
2020-03-25 17:31:44 -07:00
TreeHugger Robot
b1a06b07ff
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0747e57f25
-s ours am: 7b0240898e
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Id73bbcec6db348b1ea7ac1c3e474f0cf066252bf
2020-03-26 00:18:34 +00:00
TreeHugger Robot
c7e9a41c3d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0747e57f25
-s ours am: 7b0240898e
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I2b66b94bfbc19e8efb5b28b643ce939aff284d5b
2020-03-26 00:18:05 +00:00