diff options
| author | solb@chromium.org <solb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-29 08:24:42 +0000 |
|---|---|---|
| committer | solb@chromium.org <solb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-29 08:24:42 +0000 |
| commit | d1a92e78b16c30addaea1416de9cdce8917c64ab (patch) | |
| tree | f555f2f56409adefc0eba3fa4b9354d123b2bfc5 /remoting | |
| parent | e65999df15be00fcd846082766c0728f56077ebe (diff) | |
| download | chromium_src-d1a92e78b16c30addaea1416de9cdce8917c64ab.zip chromium_src-d1a92e78b16c30addaea1416de9cdce8917c64ab.tar.gz chromium_src-d1a92e78b16c30addaea1416de9cdce8917c64ab.tar.bz2 | |
Fully enable Chromoting Android client NAT traversal
This should now work in all network environments
Review URL: https://chromiumcodereview.appspot.com/20790003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/android/java/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | remoting/client/jni/chromoting_jni_instance.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/remoting/android/java/AndroidManifest.xml b/remoting/android/java/AndroidManifest.xml index 17adcb0..02db6dd 100644 --- a/remoting/android/java/AndroidManifest.xml +++ b/remoting/android/java/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.chromium.chromoting" - android:versionCode="4" - android:versionName="0.04"> + android:versionCode="5" + android:versionName="0.05"> <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14"/> <uses-permission android:name="android.permission.GET_ACCOUNTS"/> diff --git a/remoting/client/jni/chromoting_jni_instance.cc b/remoting/client/jni/chromoting_jni_instance.cc index f284672..ecf8632 100644 --- a/remoting/client/jni/chromoting_jni_instance.cc +++ b/remoting/client/jni/chromoting_jni_instance.cc @@ -215,7 +215,7 @@ void ChromotingJniInstance::ConnectToHostOnNetworkThread() { *signaling_config_)); network_settings_.reset(new NetworkSettings( - NetworkSettings::NAT_TRAVERSAL_OUTGOING)); + NetworkSettings::NAT_TRAVERSAL_ENABLED)); scoped_ptr<protocol::TransportFactory> fact( protocol::LibjingleTransportFactory::Create( *network_settings_, |