commit 2c3933c6736020ab5a97afde564f49fde74900a7
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 17 00:59:32 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 17 00:59:33 2017 +0000
tree 9c7b2643e1e8deb6d76815c50d7a115d23e3ce5c
parent a772e1703bc5274f96aa028d9425e6b6d9c732bb
parent b114a6138b9fad2c4c614f821dff8cd066797e94

Merge "wpa_supplicant(hidl): Fix WPS method string"

wpa_supplicant/hidl/iface_config_utils.cpp

diff --git a/wpa_supplicant/hidl/iface_config_utils.cpp b/wpa_supplicant/hidl/iface_config_utils.cpp
index 643a97f..b6bd3d8 100644
--- a/wpa_supplicant/hidl/iface_config_utils.cpp
+++ b/wpa_supplicant/hidl/iface_config_utils.cpp
@@ -55,13 +55,13 @@
 	      {WpsConfigMethods::INT_NFC_TOKEN, "int_nfc_token"},
 	      {WpsConfigMethods::EXT_NFC_TOKEN, "ext_nfc_token"},
 	      {WpsConfigMethods::NFC_INTERFACE, "nfc_interface"},
-	      {WpsConfigMethods::PUSHBUTTON, "pushbutton"},
+	      {WpsConfigMethods::PUSHBUTTON, "push_button"},
 	      {WpsConfigMethods::KEYPAD, "keypad"},
-	      {WpsConfigMethods::VIRT_PUSHBUTTON, "virt_pushbutton"},
-	      {WpsConfigMethods::PHY_PUSHBUTTON, "phy_pushbutton"},
+	      {WpsConfigMethods::VIRT_PUSHBUTTON, "virtual_push_button"},
+	      {WpsConfigMethods::PHY_PUSHBUTTON, "physical_push_button"},
 	      {WpsConfigMethods::P2PS, "p2ps"},
-	      {WpsConfigMethods::VIRT_DISPLAY, "virt_display"},
-	      {WpsConfigMethods::PHY_DISPLAY, "phy_display"}}) {
+	      {WpsConfigMethods::VIRT_DISPLAY, "virtual_display"},
+	      {WpsConfigMethods::PHY_DISPLAY, "physical_display"}}) {
 		if (config_methods & flag_and_name.first) {
 			config_methods_str += flag_and_name.second;
 			config_methods_str += " ";