Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c30dc237 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bluetooth AIDL: SetTerminalRaw on fd" am: 4de72a22 am: bb8c28de am:... 

Merge "Bluetooth AIDL: SetTerminalRaw on fd" am: 4de72a22 am: bb8c28de am: 8b2a8774 am: f3dcc82a

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2556557



Change-Id: Id62469d0a48e43e0e1f6e9ca64c84d36e40527c5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 82c5b220 f3dcc82a

bluetooth/aidl/default/BluetoothHci.cpp

+2 −4
Original line number Original line Diff line number Diff line
@@ -117,11 +117,9 @@ int BluetoothHci::getFdFromDevPath() { 
          strerror(errno));

          strerror(errno));

    return fd;

    return fd;

  }

  }

  if (int ret = SetTerminalRaw(mFd) < 0) {

  if (int ret = SetTerminalRaw(fd) < 0) {

    ALOGE("Could not make %s a raw terminal %d(%s)", mDevPath.c_str(), ret,

    ALOGI("Could not make %s a raw terminal %d(%s)", mDevPath.c_str(), ret,

          strerror(errno));

          strerror(errno));

    ::close(fd);

    return -1;

  }

  }

  return fd;

  return fd;

}

}