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

Merge branch 'master' into patch-1

Browse source
This commit is contained in:
Simon Fels 2018-03-01 14:07:52 +02:00 • committed by GitHub
commit 94ba25f47c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 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 frame_bottom = data.readInt32();
auto task_id = data.readInt32(); auto task_id = data.readInt32();
auto stack_id = data.readInt32(); auto stack_id = data.readInt32();
auto rotation_angle = data.readInt32();
return anbox::PlatformApiStub::WindowStateUpdate::Window{ return anbox::PlatformApiStub::WindowStateUpdate::Window{
-1, // Display id will be added by the caller -1, // Display id will be added by the caller

4
kernel/binder/binder.c
View file

@ -137,7 +137,11 @@ static DECLARE_WAIT_QUEUE_HEAD(binder_user_error_wait);
static int binder_stop_on_user_error; static int binder_stop_on_user_error;
static int binder_set_stop_on_user_error(const char *val, static int binder_set_stop_on_user_error(const char *val,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
const struct kernel_param *kp)
#else
struct kernel_param *kp) struct kernel_param *kp)
#endif
{ {
int ret; int ret;

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> template <typename stream_protocol>
void BaseSocketMessenger<stream_protocol>::set_no_delay() { void BaseSocketMessenger<stream_protocol>::set_no_delay() {
const auto fd = socket->native(); const auto fd = socket->native_handle();
int flag = 1; int flag = 1;
const auto ret = const auto ret =
::setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, ::setsockopt(fd, IPPROTO_TCP, TCP_NODELAY,