shill: Prioritize WiFi over WiMAX.

BUG=chrome-os-partner:16146
TEST=Tested the following:
1. Build and run unit tests.
2. Connect to a WiFi and WiMAX network and verify that WiFi is the
   active connection. Disable WiFi and verify that WiMAX becomes the
   active connection. Re-enable WiFi and verify that WiFi becomes the
   active connection again.

(cherry picked from commit 3cafe3848c12ac3ed49fb470a8d7e4cc6ea47d1a)

Change-Id: Ibd8691d726032cfe25f7e699b008fc7e7d769e88
Reviewed-on: https://gerrit.chromium.org/gerrit/38036
Reviewed-by: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
1 file changed
tree: 9833333cd044908fd32b07f7b007d00b7c6a661d
  1. dbus_bindings/
  2. doc/
  3. .gitignore
  4. accessor_interface.h
  5. adaptor_interfaces.h
  6. arp_client.cc
  7. arp_client.h
  8. arp_client_unittest.cc
  9. arp_packet.cc
  10. arp_packet.h
  11. arp_packet_unittest.cc
  12. async_connection.cc
  13. async_connection.h
  14. async_connection_unittest.cc
  15. byte_string.cc
  16. byte_string.h
  17. byte_string_unittest.cc
  18. callback80211_object.cc
  19. callback80211_object.h
  20. callbacks.h
  21. cellular.cc
  22. cellular.h
  23. cellular_capability.cc
  24. cellular_capability.h
  25. cellular_capability_cdma.cc
  26. cellular_capability_cdma.h
  27. cellular_capability_cdma_unittest.cc
  28. cellular_capability_classic.cc
  29. cellular_capability_classic.h
  30. cellular_capability_classic_unittest.cc
  31. cellular_capability_gsm.cc
  32. cellular_capability_gsm.h
  33. cellular_capability_gsm_unittest.cc
  34. cellular_capability_universal.cc
  35. cellular_capability_universal.h
  36. cellular_capability_universal_unittest.cc
  37. cellular_error.cc
  38. cellular_error.h
  39. cellular_service.cc
  40. cellular_service.h
  41. cellular_service_unittest.cc
  42. cellular_unittest.cc
  43. config80211.cc
  44. config80211.h
  45. config80211_unittest.cc
  46. connection.cc
  47. connection.h
  48. connection_unittest.cc
  49. control_interface.h
  50. crypto_des_cbc.cc
  51. crypto_des_cbc.h
  52. crypto_des_cbc_unittest.cc
  53. crypto_interface.h
  54. crypto_provider.cc
  55. crypto_provider.h
  56. crypto_provider_unittest.cc
  57. crypto_rot47.cc
  58. crypto_rot47.h
  59. crypto_rot47_unittest.cc
  60. dbus_adaptor.cc
  61. dbus_adaptor.h
  62. dbus_adaptor_unittest.cc
  63. dbus_control.cc
  64. dbus_control.h
  65. dbus_manager.cc
  66. dbus_manager.h
  67. dbus_manager_unittest.cc
  68. dbus_objectmanager_proxy.cc
  69. dbus_objectmanager_proxy.h
  70. dbus_objectmanager_proxy_interface.h
  71. dbus_properties.cc
  72. dbus_properties.h
  73. dbus_properties_proxy.cc
  74. dbus_properties_proxy.h
  75. dbus_properties_proxy_interface.h
  76. dbus_properties_unittest.cc
  77. dbus_property_matchers.h
  78. dbus_service_proxy.cc
  79. dbus_service_proxy.h
  80. dbus_service_proxy_interface.h
  81. default_profile.cc
  82. default_profile.h
  83. default_profile_unittest.cc
  84. device.cc
  85. device.h
  86. device_dbus_adaptor.cc
  87. device_dbus_adaptor.h
  88. device_info.cc
  89. device_info.h
  90. device_info_unittest.cc
  91. device_stub.h
  92. device_unittest.cc
  93. dhcp_config.cc
  94. dhcp_config.h
  95. dhcp_config_unittest.cc
  96. dhcp_provider.cc
  97. dhcp_provider.h
  98. dhcp_provider_unittest.cc
  99. dhcp_proxy_interface.h
  100. dhcpcd_proxy.cc
  101. dhcpcd_proxy.h
  102. dns_client.cc
  103. dns_client.h
  104. dns_client_unittest.cc
  105. endpoint.cc
  106. endpoint.h
  107. ephemeral_profile.cc
  108. ephemeral_profile.h
  109. error.cc
  110. error.h
  111. error_unittest.cc
  112. ethernet.cc
  113. ethernet.h
  114. ethernet_service.cc
  115. ethernet_service.h
  116. ethernet_service_unittest.cc
  117. event_dispatcher.cc
  118. event_dispatcher.h
  119. glib.cc
  120. glib.h
  121. glib_io_input_handler.cc
  122. glib_io_input_handler.h
  123. glib_io_ready_handler.cc
  124. glib_io_ready_handler.h
  125. HACKING
  126. hook_table.cc
  127. hook_table.h
  128. hook_table_unittest.cc
  129. http_proxy.cc
  130. http_proxy.h
  131. http_proxy_unittest.cc
  132. http_request.cc
  133. http_request.h
  134. http_request_unittest.cc
  135. http_url.cc
  136. http_url.h
  137. http_url_unittest.cc
  138. ieee80211.h
  139. io_handler.h
  140. ip_address.cc
  141. ip_address.h
  142. ip_address_unittest.cc
  143. ipconfig.cc
  144. ipconfig.h
  145. ipconfig_dbus_adaptor.cc
  146. ipconfig_dbus_adaptor.h
  147. ipconfig_unittest.cc
  148. kernel_bound_nlmessage.cc
  149. kernel_bound_nlmessage.h
  150. key_file_store.cc
  151. key_file_store.h
  152. key_file_store_unittest.cc
  153. key_value_store.cc
  154. key_value_store.h
  155. key_value_store_matcher.h
  156. key_value_store_unittest.cc
  157. l2tp_ipsec_driver.cc
  158. l2tp_ipsec_driver.h
  159. l2tp_ipsec_driver_unittest.cc
  160. LICENSE
  161. link_monitor.cc
  162. link_monitor.h
  163. link_monitor_unittest.cc
  164. logging.h
  165. Makefile
  166. manager.cc
  167. manager.h
  168. manager_dbus_adaptor.cc
  169. manager_dbus_adaptor.h
  170. manager_unittest.cc
  171. memory_log.cc
  172. memory_log.h
  173. memory_log_unittest.cc
  174. metrics.cc
  175. metrics.h
  176. metrics_unittest.cc
  177. minijail.cc
  178. minijail.h
  179. mm1_modem_modem3gpp_proxy.cc
  180. mm1_modem_modem3gpp_proxy.h
  181. mm1_modem_modem3gpp_proxy_interface.h
  182. mm1_modem_modemcdma_proxy.cc
  183. mm1_modem_modemcdma_proxy.h
  184. mm1_modem_modemcdma_proxy_interface.h
  185. mm1_modem_proxy.cc
  186. mm1_modem_proxy.h
  187. mm1_modem_proxy_interface.h
  188. mm1_modem_simple_proxy.cc
  189. mm1_modem_simple_proxy.h
  190. mm1_modem_simple_proxy_interface.h
  191. mm1_sim_proxy.cc
  192. mm1_sim_proxy.h
  193. mm1_sim_proxy_interface.h
  194. mock_adaptors.cc
  195. mock_adaptors.h
  196. mock_ares.cc
  197. mock_ares.h
  198. mock_arp_client.cc
  199. mock_arp_client.h
  200. mock_async_connection.cc
  201. mock_async_connection.h
  202. mock_cellular.cc
  203. mock_cellular.h
  204. mock_cellular_service.cc
  205. mock_cellular_service.h
  206. mock_connection.cc
  207. mock_connection.h
  208. mock_control.cc
  209. mock_control.h
  210. mock_dbus_manager.cc
  211. mock_dbus_manager.h
  212. mock_dbus_objectmanager_proxy.cc
  213. mock_dbus_objectmanager_proxy.h
  214. mock_dbus_properties_proxy.cc
  215. mock_dbus_properties_proxy.h
  216. mock_dbus_service_proxy.cc
  217. mock_dbus_service_proxy.h
  218. mock_device.cc
  219. mock_device.h
  220. mock_device_info.cc
  221. mock_device_info.h
  222. mock_dhcp_config.cc
  223. mock_dhcp_config.h
  224. mock_dhcp_provider.cc
  225. mock_dhcp_provider.h
  226. mock_dhcp_proxy.cc
  227. mock_dhcp_proxy.h
  228. mock_dns_client.cc
  229. mock_dns_client.h
  230. mock_ethernet.cc
  231. mock_ethernet.h
  232. mock_event_dispatcher.cc
  233. mock_event_dispatcher.h
  234. mock_glib.cc
  235. mock_glib.h
  236. mock_http_request.cc
  237. mock_http_request.h
  238. mock_ipconfig.cc
  239. mock_ipconfig.h
  240. mock_link_monitor.cc
  241. mock_link_monitor.h
  242. mock_log.cc
  243. mock_log.h
  244. mock_log_unittest.cc
  245. mock_manager.cc
  246. mock_manager.h
  247. mock_metrics.cc
  248. mock_metrics.h
  249. mock_minijail.cc
  250. mock_minijail.h
  251. mock_mm1_modem_modem3gpp_proxy.cc
  252. mock_mm1_modem_modem3gpp_proxy.h
  253. mock_mm1_modem_modemcdma_proxy.cc
  254. mock_mm1_modem_modemcdma_proxy.h
  255. mock_mm1_modem_proxy.cc
  256. mock_mm1_modem_proxy.h
  257. mock_mm1_modem_simple_proxy.cc
  258. mock_mm1_modem_simple_proxy.h
  259. mock_mm1_sim_proxy.cc
  260. mock_mm1_sim_proxy.h
  261. mock_modem.cc
  262. mock_modem.h
  263. mock_modem_cdma_proxy.cc
  264. mock_modem_cdma_proxy.h
  265. mock_modem_gobi_proxy.cc
  266. mock_modem_gobi_proxy.h
  267. mock_modem_gsm_card_proxy.cc
  268. mock_modem_gsm_card_proxy.h
  269. mock_modem_gsm_network_proxy.cc
  270. mock_modem_gsm_network_proxy.h
  271. mock_modem_info.cc
  272. mock_modem_info.h
  273. mock_modem_manager_proxy.cc
  274. mock_modem_manager_proxy.h
  275. mock_modem_proxy.cc
  276. mock_modem_proxy.h
  277. mock_modem_simple_proxy.cc
  278. mock_modem_simple_proxy.h
  279. mock_nl80211_socket.h
  280. mock_nss.cc
  281. mock_nss.h
  282. mock_openvpn_driver.cc
  283. mock_openvpn_driver.h
  284. mock_openvpn_management_server.cc
  285. mock_openvpn_management_server.h
  286. mock_portal_detector.cc
  287. mock_portal_detector.h
  288. mock_power_manager.cc
  289. mock_power_manager.h
  290. mock_power_manager_proxy.cc
  291. mock_power_manager_proxy.h
  292. mock_process_killer.cc
  293. mock_process_killer.h
  294. mock_profile.cc
  295. mock_profile.h
  296. mock_property_store.cc
  297. mock_property_store.h
  298. mock_proxy_factory.cc
  299. mock_proxy_factory.h
  300. mock_resolver.cc
  301. mock_resolver.h
  302. mock_routing_table.cc
  303. mock_routing_table.h
  304. mock_rtnl_handler.cc
  305. mock_rtnl_handler.h
  306. mock_service.cc
  307. mock_service.h
  308. mock_sockets.cc
  309. mock_sockets.h
  310. mock_store.cc
  311. mock_store.h
  312. mock_supplicant_bss_proxy.cc
  313. mock_supplicant_bss_proxy.h
  314. mock_supplicant_interface_proxy.cc
  315. mock_supplicant_interface_proxy.h
  316. mock_supplicant_process_proxy.cc
  317. mock_supplicant_process_proxy.h
  318. mock_time.cc
  319. mock_time.h
  320. mock_vpn.cc
  321. mock_vpn.h
  322. mock_vpn_driver.cc
  323. mock_vpn_driver.h
  324. mock_vpn_provider.cc
  325. mock_vpn_provider.h
  326. mock_vpn_service.cc
  327. mock_vpn_service.h
  328. mock_wifi.cc
  329. mock_wifi.h
  330. mock_wifi_service.cc
  331. mock_wifi_service.h
  332. mock_wimax.cc
  333. mock_wimax.h
  334. mock_wimax_device_proxy.cc
  335. mock_wimax_device_proxy.h
  336. mock_wimax_manager_proxy.cc
  337. mock_wimax_manager_proxy.h
  338. mock_wimax_network_proxy.cc
  339. mock_wimax_network_proxy.h
  340. mock_wimax_provider.cc
  341. mock_wimax_provider.h
  342. mock_wimax_service.cc
  343. mock_wimax_service.h
  344. modem.cc
  345. modem.h
  346. modem_1.cc
  347. modem_1_unittest.cc
  348. modem_cdma_proxy.cc
  349. modem_cdma_proxy.h
  350. modem_cdma_proxy_interface.h
  351. modem_classic.cc
  352. modem_gobi_proxy.cc
  353. modem_gobi_proxy.h
  354. modem_gobi_proxy_interface.h
  355. modem_gsm_card_proxy.cc
  356. modem_gsm_card_proxy.h
  357. modem_gsm_card_proxy_interface.h
  358. modem_gsm_network_proxy.cc
  359. modem_gsm_network_proxy.h
  360. modem_gsm_network_proxy_interface.h
  361. modem_info.cc
  362. modem_info.h
  363. modem_info_unittest.cc
  364. modem_manager.cc
  365. modem_manager.h
  366. modem_manager_proxy.cc
  367. modem_manager_proxy.h
  368. modem_manager_proxy_interface.h
  369. modem_manager_unittest.cc
  370. modem_proxy.cc
  371. modem_proxy.h
  372. modem_proxy_interface.h
  373. modem_simple_proxy.cc
  374. modem_simple_proxy.h
  375. modem_simple_proxy_interface.h
  376. modem_unittest.cc
  377. netlink_socket.cc
  378. netlink_socket.h
  379. nice_mock_control.cc
  380. nice_mock_control.h
  381. nl80211_socket.cc
  382. nl80211_socket.h
  383. nss.cc
  384. nss.h
  385. nss_unittest.cc
  386. openvpn_driver.cc
  387. openvpn_driver.h
  388. openvpn_driver_unittest.cc
  389. openvpn_management_server.cc
  390. openvpn_management_server.h
  391. openvpn_management_server_unittest.cc
  392. portal_detector.cc
  393. portal_detector.h
  394. portal_detector_unittest.cc
  395. power_manager.cc
  396. power_manager.h
  397. power_manager_proxy.cc
  398. power_manager_proxy.h
  399. power_manager_proxy_interface.h
  400. power_manager_unittest.cc
  401. process_killer.cc
  402. process_killer.h
  403. process_killer_unittest.cc
  404. profile.cc
  405. profile.h
  406. profile_dbus_adaptor.cc
  407. profile_dbus_adaptor.h
  408. profile_dbus_property_exporter.cc
  409. profile_dbus_property_exporter.h
  410. profile_dbus_property_exporter_unittest.cc
  411. profile_unittest.cc
  412. property_accessor.h
  413. property_accessor_unittest.cc
  414. property_iterator.h
  415. property_store.cc
  416. property_store.h
  417. property_store_inspector.cc
  418. property_store_inspector.h
  419. property_store_unittest.cc
  420. property_store_unittest.h
  421. provider_db_unittest.bfd
  422. proxy_factory.cc
  423. proxy_factory.h
  424. refptr_types.h
  425. resolver.cc
  426. resolver.h
  427. resolver_unittest.cc
  428. routing_table.cc
  429. routing_table.h
  430. routing_table_entry.h
  431. routing_table_unittest.cc
  432. rpc_task.cc
  433. rpc_task.h
  434. rpc_task_dbus_adaptor.cc
  435. rpc_task_dbus_adaptor.h
  436. rpc_task_unittest.cc
  437. rtnl_handler.cc
  438. rtnl_handler.h
  439. rtnl_handler_unittest.cc
  440. rtnl_listener.cc
  441. rtnl_listener.h
  442. rtnl_listener_unittest.cc
  443. rtnl_message.cc
  444. rtnl_message.h
  445. rtnl_message_unittest.cc
  446. scope_logger.cc
  447. scope_logger.h
  448. scope_logger_unittest.cc
  449. service.cc
  450. service.h
  451. service_dbus_adaptor.cc
  452. service_dbus_adaptor.h
  453. service_sorter.h
  454. service_under_test.cc
  455. service_under_test.h
  456. service_unittest.cc
  457. shill.conf
  458. shill_ares.cc
  459. shill_ares.h
  460. shill_config.cc
  461. shill_config.h
  462. shill_daemon.cc
  463. shill_daemon.h
  464. shill_main.cc
  465. shill_test_config.cc
  466. shill_test_config.h
  467. shill_time.cc
  468. shill_time.h
  469. shill_unittest.cc
  470. sockets.cc
  471. sockets.h
  472. static_ip_parameters.cc
  473. static_ip_parameters.h
  474. static_ip_parameters_unittest.cc
  475. store_interface.h
  476. supplicant_bss_proxy.cc
  477. supplicant_bss_proxy.h
  478. supplicant_bss_proxy_interface.h
  479. supplicant_interface_proxy.cc
  480. supplicant_interface_proxy.h
  481. supplicant_interface_proxy_interface.h
  482. supplicant_process_proxy.cc
  483. supplicant_process_proxy.h
  484. supplicant_process_proxy_interface.h
  485. technology.cc
  486. technology.h
  487. technology_unittest.cc
  488. TESTING
  489. testrunner.cc
  490. user_bound_nlmessage.cc
  491. user_bound_nlmessage.h
  492. virtio_ethernet.cc
  493. virtio_ethernet.h
  494. vpn.cc
  495. vpn.h
  496. vpn_driver.cc
  497. vpn_driver.h
  498. vpn_driver_unittest.cc
  499. vpn_provider.cc
  500. vpn_provider.h
  501. vpn_provider_unittest.cc
  502. vpn_service.cc
  503. vpn_service.h
  504. vpn_service_unittest.cc
  505. vpn_unittest.cc
  506. wifi.cc
  507. wifi.h
  508. wifi_endpoint.cc
  509. wifi_endpoint.h
  510. wifi_endpoint_unittest.cc
  511. wifi_service.cc
  512. wifi_service.h
  513. wifi_service_unittest.cc
  514. wifi_unittest.cc
  515. wimax.cc
  516. wimax.h
  517. wimax_device_proxy.cc
  518. wimax_device_proxy.h
  519. wimax_device_proxy_interface.h
  520. wimax_manager_proxy.cc
  521. wimax_manager_proxy.h
  522. wimax_manager_proxy_interface.h
  523. wimax_network_proxy.cc
  524. wimax_network_proxy.h
  525. wimax_network_proxy_interface.h
  526. wimax_provider.cc
  527. wimax_provider.h
  528. wimax_provider_unittest.cc
  529. wimax_service.cc
  530. wimax_service.h
  531. wimax_service_unittest.cc
  532. wimax_unittest.cc
  533. wpa_supplicant.cc
  534. wpa_supplicant.h