jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into basic-touch

Browse source
This commit is contained in:
Simon Fels 2018-02-05 07:46:35 +02:00 • committed by GitHub
commit 460f1f4da8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
android/service/platform_service.cpp
View file

@ -49,6 +49,7 @@ anbox::PlatformApiStub::WindowStateUpdate::Window PlatformService::unpack_window
auto frame_bottom = data.readInt32();
auto task_id = data.readInt32();
auto stack_id = data.readInt32();
auto rotation_angle = data.readInt32();
return anbox::PlatformApiStub::WindowStateUpdate::Window{
-1, // Display id will be added by the caller

2
src/anbox/network/base_socket_messenger.cpp
View file

@ -138,7 +138,7 @@ unsigned short BaseSocketMessenger<stream_protocol>::local_port() const {
template <typename stream_protocol>
void BaseSocketMessenger<stream_protocol>::set_no_delay() {
const auto fd = socket->native();
const auto fd = socket->native_handle();
int flag = 1;
const auto ret =
::setsockopt(fd, IPPROTO_TCP, TCP_NODELAY,