| commit | cef9f495e002b088386a5d9511f18ae0ed9c95cb | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Sat Apr 29 01:32:04 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Apr 29 01:32:04 2023 +0000 |
| tree | 2e954e513e875270be81946ce5feacbe85a44638 | |
| parent | ad8c146dc36a5b783ebc063736a9b59c90cbb24d [diff] | |
| parent | 261efeee0c68e91ec7d9626037c405e4da9742ba [diff] |
Merge "Bluetooth AIDL: SetTerminalRaw on fd" into udc-dev am: 261efeee0c Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/22935417 Change-Id: Ibb70752c4de9f46d8fb24f3e106948247e92ea87 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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; }