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

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

Merge "Bluetooth AIDL: SetTerminalRaw on fd" into udc-dev am: 261efeee 

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



Change-Id: I81546cff9244f0232ed62350e60083039426bba8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89d08942 261efeee

bluetooth/aidl/default/BluetoothHci.cpp

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

    return fd;

  }

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

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

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

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

          strerror(errno));

    ::close(fd);

    return -1;

  }

  return fd;

}