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

Don't try to connect to host adb when timer is aborted

Browse source
This commit is contained in:
Simon Fels 2017-05-14 12:59:08 +02:00
commit 56ed59334f
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/anbox/qemu/adb_message_processor.cpp
View file

@ -132,7 +132,11 @@ void AdbMessageProcessor::wait_for_host_connection() {
// Try again later when the host adb service is maybe available
host_notify_timer_.cancel();
host_notify_timer_.expires_from_now(default_adb_wait_time);
host_notify_timer_.async_wait([&](const boost::system::error_code &) { wait_for_host_connection(); });
host_notify_timer_.async_wait([this](const boost::system::error_code &err) {
if (err)
return;
wait_for_host_connection();
});
}
}
@ -156,8 +160,7 @@ void AdbMessageProcessor::on_host_connection(std::shared_ptr<boost::asio::basic_
void AdbMessageProcessor::read_next_host_message() {
auto callback = std::bind(&AdbMessageProcessor::on_host_read_size, this, _1, _2);
host_messenger_->async_receive_msg(callback,
boost::asio::buffer(host_buffer_));
host_messenger_->async_receive_msg(callback, boost::asio::buffer(host_buffer_));
}
void AdbMessageProcessor::on_host_read_size(const boost::system::error_code &error, std::size_t bytes_read) {