resolved conflicts for merge of 64b816ba to master

Change-Id: Ie6348e38e90e48ffe115e63e5fde16640e2c3d92

diff --cc server/SoftapController.cpp
index f9ca68b,0759bde..2465529
--- 1/server/SoftapController.cpp
--- 2/server/SoftapController.cpp
+++ b/server/SoftapController.cpp
@@@ -139,20 -136,28 +136,28 @@@ int SoftapController::setSoftap(int arg
              channel = AP_CHANNEL_DEFAULT;
      }
  
-     asprintf(&wbuf, "interface=%s\ndriver=nl80211\nctrl_interface="
-             "/data/misc/wifi/hostapd\nssid=%s\nchannel=%d\nieee80211n=1\n"
-             "hw_mode=%c\nignore_broadcast_ssid=%d\nwowlan_triggers=any\n",
-             argv[2], argv[3], channel, (channel <= 14) ? 'g' : 'a', hidden);
- 
+     std::string wbuf(android::StringPrintf("interface=%s\n"
+             "driver=nl80211\n"
+             "ctrl_interface=/data/misc/wifi/hostapd\n"
+             "ssid=%s\n"
+             "channel=%d\n"
+             "ieee80211n=1\n"
 -            "hw_mode=g\n"
++            "hw_mode=%c\n"
+             "ignore_broadcast_ssid=%d\n"
+             "wowlan_triggers=any\n",
 -            argv[2], argv[3], channel, hidden));
++            argv[2], argv[3], channel, (channel <= 14) ? 'g' : 'a', hidden));
+ 
+     std::string fbuf;
      if (argc > 7) {
+         char psk_str[2*SHA256_DIGEST_LENGTH+1];
          if (!strcmp(argv[6], "wpa-psk")) {
              generatePsk(argv[3], argv[7], psk_str);
-             asprintf(&fbuf, "%swpa=3\nwpa_pairwise=TKIP CCMP\nwpa_psk=%s\n", wbuf, psk_str);
+             fbuf = android::StringPrintf("%swpa=3\nwpa_pairwise=TKIP CCMP\nwpa_psk=%s\n", wbuf.c_str(), psk_str);
          } else if (!strcmp(argv[6], "wpa2-psk")) {
              generatePsk(argv[3], argv[7], psk_str);
-             asprintf(&fbuf, "%swpa=2\nrsn_pairwise=CCMP\nwpa_psk=%s\n", wbuf, psk_str);
+             fbuf = android::StringPrintf("%swpa=2\nrsn_pairwise=CCMP\nwpa_psk=%s\n", wbuf.c_str(), psk_str);
          } else if (!strcmp(argv[6], "open")) {
-             asprintf(&fbuf, "%s", wbuf);
+             fbuf = wbuf;
          }
      } else if (argc > 6) {
          if (!strcmp(argv[6], "open")) {