commit 261efeee0c68e91ec7d9626037c405e4da9742ba
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Apr 29 01:03:11 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 29 01:03:11 2023 +0000
tree 2e954e513e875270be81946ce5feacbe85a44638
parent 3d35c2e75cf61d7dfb16bff6dc019eef78cf323e
parent d1abb34b44faa4ff0c56b3ff770067afb5ce8e25

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

bluetooth/aidl/default/BluetoothHci.cpp

diff --git a/bluetooth/aidl/default/BluetoothHci.cpp b/bluetooth/aidl/default/BluetoothHci.cpp
index d4e4b34..ac2eabc 100644
--- a/bluetooth/aidl/default/BluetoothHci.cpp
+++ b/bluetooth/aidl/default/BluetoothHci.cpp
@@ -117,11 +117,9 @@
           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;
 }