resolve merge conflicts of 1f433cb to mnc-dr-dev

Change-Id: I7278875d21c59316217cb1b99d902f4fc248ca06

diff --cc audio_a2dp_hw/audio_a2dp_hw.c
Simple merge

diff --cc btif/co/bta_hh_co.c
index bd6fd6f,b2fbb5f..9041397
--- 1/btif/co/bta_hh_co.c
--- 2/btif/co/bta_hh_co.c
+++ b/btif/co/bta_hh_co.c
@@@ -58,8 -46,8 +58,8 @@@ void uhid_set_non_blocking(int fd
  /*Internal function to perform UHID write and error checking*/
  static int uhid_write(int fd, const struct uhid_event *ev)
  {
-     ssize_t ret = write(fd, ev, sizeof(*ev));
 -    ssize_t ret;
 -    ret = TEMP_FAILURE_RETRY(write(fd, ev, sizeof(*ev)));
++    ssize_t ret = TEMP_FAILURE_RETRY(write(fd, ev, sizeof(*ev)));
 +
      if (ret < 0){
          int rtn = -errno;
          APPL_TRACE_ERROR("%s: Cannot write to uhid:%s",
@@@ -202,11 -183,8 +202,11 @@@ static void *btif_hh_poll_event_thread(
      pfds[0].fd = p_dev->fd;
      pfds[0].events = POLLIN;
  
 +    // Set the uhid fd as non-blocking to ensure we never block the BTU thread
 +    uhid_set_non_blocking(p_dev->fd);
 +
      while(p_dev->hh_keep_polling){
-         ret = poll(pfds, 1, 50);
+         ret = TEMP_FAILURE_RETRY(poll(pfds, 1, 50));
          if (ret < 0) {
              APPL_TRACE_ERROR("%s: Cannot poll for fds: %s\n", __FUNCTION__, strerror(errno));
              break;

diff --cc btif/src/btif_core.c
index 0ff9651,bbd75ee..1f28dc8
--- 1/btif/src/btif_core.c
--- 2/btif/src/btif_core.c
+++ b/btif/src/btif_core.c
@@@ -342,19 -329,22 +343,19 @@@ static void btif_fetch_local_bdaddr(bt_
      {
          int addr_fd;
  
 -        BTIF_TRACE_DEBUG("local bdaddr is stored in %s", val);
 +        BTIF_TRACE_DEBUG("%s, local bdaddr is stored in %s", __func__, val);
  
-         if ((addr_fd = open(val, O_RDONLY)) != -1)
+         if ((addr_fd = TEMP_FAILURE_RETRY(open(val, O_RDONLY))) != -1)
          {
              memset(val, 0, sizeof(val));
-             read(addr_fd, val, FACTORY_BT_BDADDR_STORAGE_LEN);
+             TEMP_FAILURE_RETRY(read(addr_fd, val, FACTORY_BT_BDADDR_STORAGE_LEN));
 -            string_to_bdaddr(val, local_addr);
              /* If this is not a reserved/special bda, then use it */
 -            if (memcmp(local_addr->address, null_bdaddr, BD_ADDR_LEN) != 0)
 +            if ((string_to_bdaddr(val, local_addr)) &&
 +                (memcmp(local_addr->address, null_bdaddr, BD_ADDR_LEN) != 0))
              {
                  valid_bda = TRUE;
 -                BTIF_TRACE_DEBUG("Got Factory BDA %02X:%02X:%02X:%02X:%02X:%02X",
 -                    local_addr->address[0], local_addr->address[1], local_addr->address[2],
 -                    local_addr->address[3], local_addr->address[4], local_addr->address[5]);
 +                BTIF_TRACE_DEBUG("%s: Got Factory BDA %s", __func__, val);
              }
 -
              close(addr_fd);
          }
      }

diff --cc btif/src/btif_dm.c
Simple merge

diff --cc btif/src/btif_hh.c
Simple merge

diff --cc btif/src/btif_pan.c
Simple merge

diff --cc btif/src/btif_rc.c
Simple merge

diff --cc hci/src/hci_hal_h4.c
Simple merge

diff --cc hci/test/hci_hal_h4_test.cpp
Simple merge

diff --cc osi/src/eager_reader.c
Simple merge