diff options
| -rw-r--r-- | core/jni/android_server_BluetoothService.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/core/jni/android_server_BluetoothService.cpp b/core/jni/android_server_BluetoothService.cpp index 2aeca86d7828..9dbe77422f8a 100644 --- a/core/jni/android_server_BluetoothService.cpp +++ b/core/jni/android_server_BluetoothService.cpp @@ -1645,6 +1645,25 @@ static jobject getChannelFdNative(JNIEnv *env, jobject object, jstring channelPa fd = dbus_returns_unixfd(env, reply); if (fd == -1) return NULL; + int flags = fcntl(fd, F_GETFL); + if (flags < 0) { + LOGE("Can't get flags with fcntl(): %s (%d)", + strerror(errno), errno); + releaseChannelFdNative(env, object, channelPath); + close(fd); + return NULL; + } + + flags &= ~O_NONBLOCK; + int status = fcntl(fd, F_SETFL, flags); + if (status < 0) { + LOGE("Can't set flags with fcntl(): %s (%d)", + strerror(errno), errno); + releaseChannelFdNative(env, object, channelPath); + close(fd); + return NULL; + } + // Create FileDescriptor object jobject fileDesc = jniCreateFileDescriptor(env, fd); if (fileDesc == NULL) { |