commit ee05e902971fe050fd7544301b01e46a8c6a8dcf
author Sami Kalliomäki <sakal@webrtc.org> Fri Sep 28 14:38:21 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Fri Sep 28 13:25:43 2018 +0000
tree 9a6def0cdf8b23a7f999aecb0a0aac5e93131780
parent dca5a2ca735f25f70c161c0b47cea032f44ee90b

Throw IllegalStateException if native objects are used after dispose.

This makes it easier to debug issues related to double dispose /
use after dispose.

Bug: webrtc:7566, webrtc:8297
Change-Id: I07429b2b794deabb62b5f3ea1cf92eea6f66a149
Reviewed-on: https://webrtc-review.googlesource.com/102540
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Paulina Hensman <phensman@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24894}

sdk/android/api/org/webrtc/MediaStream.java

diff --git a/sdk/android/api/org/webrtc/MediaStream.java b/sdk/android/api/org/webrtc/MediaStream.java
index 7f4a434..e530fe5 100644
--- a/sdk/android/api/org/webrtc/MediaStream.java
+++ b/sdk/android/api/org/webrtc/MediaStream.java
@@ -11,8 +11,8 @@
 package org.webrtc;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Iterator;
+import java.util.List;
 
 /** Java wrapper for a C++ MediaStreamInterface. */
 public class MediaStream {
@@ -21,8 +21,7 @@
   public final List<AudioTrack> audioTracks = new ArrayList<>();
   public final List<VideoTrack> videoTracks = new ArrayList<>();
   public final List<VideoTrack> preservedVideoTracks = new ArrayList<>();
-  // Package-protected for PeerConnection.
-  final long nativeStream;
+  private long nativeStream;
 
   @CalledByNative
   public MediaStream(long nativeStream) {
@@ -30,7 +29,8 @@
   }
 
   public boolean addTrack(AudioTrack track) {
-    if (nativeAddAudioTrackToNativeStream(nativeStream, track.nativeTrack)) {
+    checkMediaStreamExists();
+    if (nativeAddAudioTrackToNativeStream(nativeStream, track.getNativeAudioTrack())) {
       audioTracks.add(track);
       return true;
     }
@@ -38,7 +38,8 @@
   }
 
   public boolean addTrack(VideoTrack track) {
-    if (nativeAddVideoTrackToNativeStream(nativeStream, track.nativeTrack)) {
+    checkMediaStreamExists();
+    if (nativeAddVideoTrackToNativeStream(nativeStream, track.getNativeVideoTrack())) {
       videoTracks.add(track);
       return true;
     }
@@ -49,7 +50,8 @@
   // is called. If video track need to be preserved after MediaStream is destroyed it
   // should be added to MediaStream using addPreservedTrack() call.
   public boolean addPreservedTrack(VideoTrack track) {
-    if (nativeAddVideoTrackToNativeStream(nativeStream, track.nativeTrack)) {
+    checkMediaStreamExists();
+    if (nativeAddVideoTrackToNativeStream(nativeStream, track.getNativeVideoTrack())) {
       preservedVideoTracks.add(track);
       return true;
     }
@@ -57,18 +59,21 @@
   }
 
   public boolean removeTrack(AudioTrack track) {
+    checkMediaStreamExists();
     audioTracks.remove(track);
-    return nativeRemoveAudioTrack(nativeStream, track.nativeTrack);
+    return nativeRemoveAudioTrack(nativeStream, track.getNativeAudioTrack());
   }
 
   public boolean removeTrack(VideoTrack track) {
+    checkMediaStreamExists();
     videoTracks.remove(track);
     preservedVideoTracks.remove(track);
-    return nativeRemoveVideoTrack(nativeStream, track.nativeTrack);
+    return nativeRemoveVideoTrack(nativeStream, track.getNativeVideoTrack());
   }
 
   @CalledByNative
   public void dispose() {
+    checkMediaStreamExists();
     // Remove and release previously added audio and video tracks.
     while (!audioTracks.isEmpty()) {
       AudioTrack track = audioTracks.get(0 /* index */);
@@ -85,9 +90,11 @@
       removeTrack(preservedVideoTracks.get(0 /* index */));
     }
     JniCommon.nativeReleaseRef(nativeStream);
+    nativeStream = 0;
   }
 
   public String getId() {
+    checkMediaStreamExists();
     return nativeGetId(nativeStream);
   }
 
@@ -116,12 +123,24 @@
     removeMediaStreamTrack(videoTracks, nativeTrack);
   }
 
+  /** Returns a pointer to webrtc::MediaStreamInterface. */
+  long getNativeMediaStream() {
+    checkMediaStreamExists();
+    return nativeStream;
+  }
+
+  private void checkMediaStreamExists() {
+    if (nativeStream == 0) {
+      throw new IllegalStateException("MediaStream has been disposed.");
+    }
+  }
+
   private static void removeMediaStreamTrack(
       List<? extends MediaStreamTrack> tracks, long nativeTrack) {
     final Iterator<? extends MediaStreamTrack> it = tracks.iterator();
     while (it.hasNext()) {
       MediaStreamTrack track = it.next();
-      if (track.nativeTrack == nativeTrack) {
+      if (track.getNativeMediaStreamTrack() == nativeTrack) {
         track.dispose();
         it.remove();
         return;