Update talk folder to revision=49260075. Same as 369 in libjingle's google code repository.

TBR=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1797004

git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@4338 4adac7df-926f-26a2-2b94-8c16560cd09d

1 files changed, 11 insertions, 0 deletions

diff --git a/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java b/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java
index bd17323..d8bc257 100644
--- a/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java
+++ b/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java
@@ -42,6 +42,7 @@ import android.widget.Toast;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.webrtc.DataChannel;
 import org.webrtc.IceCandidate;
 import org.webrtc.MediaConstraints;
 import org.webrtc.MediaStream;
@@ -333,6 +334,16 @@ public class AppRTCDemoActivity extends Activity
           }
         });
     }
+
+    @Override public void onDataChannel(final DataChannel dc) {
+      runOnUiThread(new Runnable() {
+          public void run() {
+            throw new RuntimeException(
+                "AppRTC doesn't use data channels, but got: " + dc.label() +
+                " anyway!");
+          }
+        });
+    }
   }
 
   // Implementation detail: handle offer creation/signaling and answer setting,