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

Commit 3bbc8768 authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

Merge "bluetooth_socket_manager: Call setFileDescriptor()" am: 6b66d887 am: cefbfc92

am: 1e2bbcfb

Change-Id: I6aae9f2efd4758949cd569ad0f5f92fb1b094596
parents 01192d2c 1e2bbcfb
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ Status BluetoothSocketManagerBinderServer::connectSocket(
  }

  _aidl_return->reset(new ParcelFileDescriptor());
  (*_aidl_return)->fd = socket_fd;
  (*_aidl_return)->setFileDescriptor(socket_fd, true);
  return Status::ok();
}

@@ -96,7 +96,7 @@ Status BluetoothSocketManagerBinderServer::createSocketChannel(
  }

  _aidl_return->reset(new ParcelFileDescriptor());
  (*_aidl_return)->fd = socket_fd;
  (*_aidl_return)->setFileDescriptor(socket_fd, true);
  return Status::ok();
}