diff options
| author | fischman@webrtc.org <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-03-28 19:58:03 +0000 |
|---|---|---|
| committer | fischman@webrtc.org <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-03-28 19:58:03 +0000 |
| commit | 2f6ef0f8054a585f67c4703343c3ea0f30ef0d1c (patch) | |
| tree | 906de88729845d39e3d891f22698fff89de6d0a6 /examples | |
| parent | 7ce0f9ed8df94129fddd70cdf0a53aa86d6b9d48 (diff) | |
| download | talk-2f6ef0f8054a585f67c4703343c3ea0f30ef0d1c.tar.gz | |
AppRTCDemo(android): specify DtlsSrtpKeyAgreement:true in CreatePeerConnection's constraints.
This is required to interop with Chrome now that SDES is disabled in Chrome (as of r5640).
BUG=2774
R=jiayl@chromium.org
Review URL: https://webrtc-codereview.appspot.com/10749004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@5809 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java b/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java index 46b6169..7d92a36 100644 --- a/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java +++ b/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java @@ -179,7 +179,7 @@ public class AppRTCDemoActivity extends Activity private static void createDataChannelToRegressionTestBug2302( PeerConnection pc) { DataChannel dc = pc.createDataChannel("dcLabel", new DataChannel.Init()); - abortUnless("dcLabel".equals(dc.label()), "WTF?"); + abortUnless("dcLabel".equals(dc.label()), "Unexpected label corruption?"); dc.close(); dc.dispose(); } @@ -189,6 +189,8 @@ public class AppRTCDemoActivity extends Activity factory = new PeerConnectionFactory(); MediaConstraints pcConstraints = appRtcClient.pcConstraints(); + pcConstraints.mandatory.add( + new MediaConstraints.KeyValuePair("DtlsSrtpKeyAgreement", "true")); pcConstraints.optional.add( new MediaConstraints.KeyValuePair("RtpDataChannels", "true")); pc = factory.createPeerConnection(iceServers, pcConstraints, pcObserver); |