resolved conflicts for merge of 7b90f090 to jb-mr1-dev

Change-Id: Id5b6598b20f34b5e8d2c90927d2acfae7237e69b

diff --cc SoftapController.cpp
index c4dcc7f,3d69142..7c7b2d0
--- 1/SoftapController.cpp
--- 2/SoftapController.cpp
+++ b/SoftapController.cpp
@@@ -199,6 -341,58 +200,7 @@@ int SoftapController::setSoftap(int arg
          return -1;
      }
  
 -#else
 -    /* Create command line */
 -    i = addParam(i, "ASCII_CMD", "AP_CFG");
 -    if (argc > 4) {
 -        ssid = argv[4];
 -    } else {
 -        ssid = (char *)"AndroidAP";
 -    }
 -    i = addParam(i, "SSID", ssid);
 -    if (argc > 5) {
 -        i = addParam(i, "SEC", argv[5]);
 -    } else {
 -        i = addParam(i, "SEC", "open");
 -    }
 -    if (argc > 6) {
 -        generatePsk(ssid, argv[6], psk_str);
 -        i = addParam(i, "KEY", psk_str);
 -    } else {
 -        i = addParam(i, "KEY", "12345678");
 -    }
 -    if (argc > 7) {
 -        i = addParam(i, "CHANNEL", argv[7]);
 -    } else {
 -        i = addParam(i, "CHANNEL", "6");
 -    }
 -    if (argc > 8) {
 -        i = addParam(i, "PREAMBLE", argv[8]);
 -    } else {
 -        i = addParam(i, "PREAMBLE", "0");
 -    }
 -    if (argc > 9) {
 -        i = addParam(i, "MAX_SCB", argv[9]);
 -    } else {
 -        i = addParam(i, "MAX_SCB", "8");
 -    }
 -    if ((i < 0) || ((unsigned)(i + 4) >= sizeof(mBuf))) {
 -        ALOGE("Softap set - command is too big");
 -        return i;
 -    }
 -    sprintf(&mBuf[i], "END");
 -
 -    /* system("iwpriv eth0 WL_AP_CFG ASCII_CMD=AP_CFG,SSID=\"AndroidAP\",SEC=\"open\",KEY=12345,CHANNEL=1,PREAMBLE=0,MAX_SCB=8,END"); */
 -    ret = setCommand(iface, "AP_SET_CFG");
 -    if (ret) {
 -        ALOGE("Softap set - failed: %d", ret);
 -    }
 -    else {
 -        ALOGD("Softap set - Ok");
 -        usleep(AP_SET_CFG_DELAY);
 -    }
 -#endif
+     close(fd);
      return ret;
  }