Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(395)

Unified Diff: webrtc/api/java/src/org/webrtc/MediaStream.java

Issue 1639583003: Fixing bug in MediaStream.java that caused double disposal of track. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing placement of GUARDED_BY. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/api/java/src/org/webrtc/MediaStream.java
diff --git a/webrtc/api/java/src/org/webrtc/MediaStream.java b/webrtc/api/java/src/org/webrtc/MediaStream.java
index d18c72cca30b1dee55530f14da50773b182e94fa..2128b735bf3f736a5a7ca7be8ebce153b7e0429b 100644
--- a/webrtc/api/java/src/org/webrtc/MediaStream.java
+++ b/webrtc/api/java/src/org/webrtc/MediaStream.java
@@ -55,20 +55,14 @@ public class MediaStream {
}
public boolean removeTrack(AudioTrack track) {
- if (nativeRemoveAudioTrack(nativeStream, track.nativeTrack)) {
- audioTracks.remove(track);
- return true;
- }
- return false;
+ audioTracks.remove(track);
+ return nativeRemoveAudioTrack(nativeStream, track.nativeTrack);
}
public boolean removeTrack(VideoTrack track) {
- if (nativeRemoveVideoTrack(nativeStream, track.nativeTrack)) {
- videoTracks.remove(track);
- preservedVideoTracks.remove(track);
- return true;
- }
- return false;
+ videoTracks.remove(track);
+ preservedVideoTracks.remove(track);
+ return nativeRemoveVideoTrack(nativeStream, track.nativeTrack);
}
public void dispose() {
« no previous file with comments | « webrtc/api/androidtests/src/org/webrtc/PeerConnectionTest.java ('k') | webrtc/media/webrtc/webrtcvideoengine2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698