diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-27 01:03:25 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-27 01:03:25 +0000 |
| commit | 6540eb67f9110bc38864b932e481d28ccfe27240 (patch) | |
| tree | 36bad81627f56dc66ed90ad2382afbae1a4adb2a /remoting | |
| parent | ef306c691bd041e6ab08ca596ae85ce3cbce58c3 (diff) | |
| download | chromium_src-6540eb67f9110bc38864b932e481d28ccfe27240.zip chromium_src-6540eb67f9110bc38864b932e481d28ccfe27240.tar.gz chromium_src-6540eb67f9110bc38864b932e481d28ccfe27240.tar.bz2 | |
Initialize JingleThreadWrapper in the Android client
Previously Android client was crashing because JingleThreadWrapper
was not initialized for the networking thread. It was broken by
crrev.com/271351, which removed JingleThreadWrapper initialization
from LijbingleTransportFactory.
TBR=lambroslambrou@chromium.org
Review URL: https://codereview.chromium.org/298013004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272905 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/client/jni/chromoting_jni_instance.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/remoting/client/jni/chromoting_jni_instance.cc b/remoting/client/jni/chromoting_jni_instance.cc index a2add66..5dd94b3 100644 --- a/remoting/client/jni/chromoting_jni_instance.cc +++ b/remoting/client/jni/chromoting_jni_instance.cc @@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "jingle/glue/thread_wrapper.h" #include "net/socket/client_socket_factory.h" #include "remoting/client/audio_player.h" #include "remoting/client/jni/android_keymap.h" @@ -314,6 +315,8 @@ void ChromotingJniInstance::ConnectToHostOnDisplayThread() { void ChromotingJniInstance::ConnectToHostOnNetworkThread() { DCHECK(jni_runtime_->network_task_runner()->BelongsToCurrentThread()); + jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop(); + client_context_.reset(new ClientContext( jni_runtime_->network_task_runner().get())); client_context_->Start(); |