commit 4de72a22979db8d8db14e160e9e28b05b8d870f2
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Apr 28 19:29:33 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 28 19:29:33 2023 +0000
tree 9cccb96cde942d7ab4d48de6829c6d1d4fb35677
parent 2facc26b0cc5e835df72e2a65327e74a591a5749
parent eb744bc14c0d1e64c4291b3f869d6055db36b0f3

Merge "Bluetooth AIDL: SetTerminalRaw on fd"

bluetooth/aidl/default/BluetoothHci.cpp

diff --git a/bluetooth/aidl/default/BluetoothHci.cpp b/bluetooth/aidl/default/BluetoothHci.cpp
index 940f2ad..18a371d 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;
 }