Fixing bug in MediaStream.java that caused double disposal of track.

talk/app/webrtc/java/src/org/webrtc/MediaStream.java

Index: talk/app/webrtc/java/src/org/webrtc/MediaStream.java
diff --git a/talk/app/webrtc/java/src/org/webrtc/MediaStream.java b/talk/app/webrtc/java/src/org/webrtc/MediaStream.java
index be00f13e674580c6ccd7553557e9e738f7adc8cd..4a36b5a9504b9a93e542f6bbcf8a7ed16e5a8c79 100644
--- a/talk/app/webrtc/java/src/org/webrtc/MediaStream.java
+++ b/talk/app/webrtc/java/src/org/webrtc/MediaStream.java
@@ -92,12 +92,16 @@ public class MediaStream {
     // Remove and release previously added audio and video tracks.
     while (!audioTracks.isEmpty()) {
       AudioTrack track = audioTracks.getFirst();
-      removeTrack(track);
+      if (!removeTrack(track)) {
+        audioTracks.remove(track);

[AlexG, 2016/01/26 22:03:36]

May be call audioTracks.remove() from removeTrack() when
nativeRemoveAudioTrack() fails to keep logic in a single place?

[Taylor Brandstetter, 2016/01/26 22:43:10]

I thought maybe there was some motivation for not removing the track in
removeTrack, so I tried to confine my changes to dispose(). But if you can't
think of any reason, I'll go with your suggestion.

+      }
       track.dispose();
     }
     while (!videoTracks.isEmpty()) {
       VideoTrack track = videoTracks.getFirst();
-      removeTrack(track);
+      if (!removeTrack(track)) {
+        videoTracks.remove(track);

[AlexG, 2016/01/26 22:03:36]

ditto

+      }
       track.dispose();
     }
     // Remove, but do not release preserved video tracks.