Add a switch to redetermine role when ICE restarts.

webrtc/api/android/jni/peerconnection_jni.cc

 /*
  *  Copyright 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1613 matching lines @@
       GetObjectField(jni, j_rtc_config, j_continual_gathering_policy_id);
 
   jfieldID j_ice_candidate_pool_size_id =
       GetFieldID(jni, j_rtc_config_class, "iceCandidatePoolSize", "I");
   jfieldID j_presume_writable_when_fully_relayed_id = GetFieldID(
       jni, j_rtc_config_class, "presumeWritableWhenFullyRelayed", "Z");
 
   jfieldID j_prune_turn_ports_id =
       GetFieldID(jni, j_rtc_config_class, "pruneTurnPorts", "Z");
 
+  jfieldID j_redetermine_role_on_ice_restart_id =

[pthatcher1, 2016/08/29 23:27:42]

If we're only going to use the switch in Chromium, do we need this Java/JNI
code?

[honghaiz3, 2016/08/29 23:32:27]

Done. Removed. 

+      GetFieldID(jni, j_rtc_config_class, "redetermineRoleOnIceRestart", "Z");
+
   rtc_config->type =
       JavaIceTransportsTypeToNativeType(jni, j_ice_transports_type);
   rtc_config->bundle_policy =
       JavaBundlePolicyToNativeType(jni, j_bundle_policy);
   rtc_config->rtcp_mux_policy =
       JavaRtcpMuxPolicyToNativeType(jni, j_rtcp_mux_policy);
   rtc_config->tcp_candidate_policy =
       JavaTcpCandidatePolicyToNativeType(jni, j_tcp_candidate_policy);
   rtc_config->candidate_network_policy =
       JavaCandidateNetworkPolicyToNativeType(jni, j_candidate_network_policy);
   JavaIceServersToJsepIceServers(jni, j_ice_servers, &rtc_config->servers);
   rtc_config->audio_jitter_buffer_max_packets =
       GetIntField(jni, j_rtc_config, j_audio_jitter_buffer_max_packets_id);
   rtc_config->audio_jitter_buffer_fast_accelerate = GetBooleanField(
       jni, j_rtc_config, j_audio_jitter_buffer_fast_accelerate_id);
   rtc_config->ice_connection_receiving_timeout =
       GetIntField(jni, j_rtc_config, j_ice_connection_receiving_timeout_id);
   rtc_config->ice_backup_candidate_pair_ping_interval = GetIntField(
       jni, j_rtc_config, j_ice_backup_candidate_pair_ping_interval_id);
   rtc_config->continual_gathering_policy =
       JavaContinualGatheringPolicyToNativeType(
           jni, j_continual_gathering_policy);
   rtc_config->ice_candidate_pool_size =
       GetIntField(jni, j_rtc_config, j_ice_candidate_pool_size_id);
+  rtc_config->presume_writable_when_fully_relayed = GetBooleanField(
+      jni, j_rtc_config, j_presume_writable_when_fully_relayed_id);
   rtc_config->prune_turn_ports =
       GetBooleanField(jni, j_rtc_config, j_prune_turn_ports_id);
-  rtc_config->presume_writable_when_fully_relayed = GetBooleanField(
-      jni, j_rtc_config, j_presume_writable_when_fully_relayed_id);
+  rtc_config->redetermine_role_on_ice_restart =
+      GetBooleanField(jni, j_rtc_config, j_redetermine_role_on_ice_restart_id);
 }
 
 JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnection)(
     JNIEnv *jni, jclass, jlong factory, jobject j_rtc_config,
     jobject j_constraints, jlong observer_p) {
   rtc::scoped_refptr<PeerConnectionFactoryInterface> f(
       reinterpret_cast<PeerConnectionFactoryInterface*>(
           factoryFromJava(factory)));
 
   PeerConnectionInterface::RTCConfiguration rtc_config;
@@ skipping 677 matching lines @@
   return JavaStringFromStdString(
       jni,
       reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id());
 }
 
 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) {
   reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release();
 }
 
 }  // namespace webrtc_jni