admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing deprecated label() that is no longer used.

Browse Source 
Bug: webrtc:8977
Change-Id: Ic1e4d0b83b1379fd5269240842eeb52f86f56cdb
Reviewed-on: https://webrtc-review.googlesource.com/65880
Commit-Queue: Seth Hampson <shampson@webrtc.org>
Reviewed-by: Benjamin Wright <benwright@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22925}
This commit is contained in:
Seth Hampson 2018-04-18 09:29:34 -07:00 committed by Commit Bot
parent 3725d544fa
commit 7ba2e19c17
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdk/android/api/org/webrtc/MediaStream.java
View File

@ -88,12 +88,6 @@ public class MediaStream {
JniCommon.nativeReleaseRef(nativeStream);
}
// TODO(shampson): Remove this when downstreams have moved to using id() instead.
@Deprecated
public String label() {
return nativeGetId(nativeStream);
}
public String getId() {
return nativeGetId(nativeStream);
}

4
sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java
View File

@ -225,7 +225,7 @@ public class PeerConnectionTest {
// TODO(bugs.webrtc.org/8491): Remove NoSynchronizedMethodCheck suppression.
@SuppressWarnings("NoSynchronizedMethodCheck")
public synchronized void onAddStream(MediaStream stream) {
assertEquals(expectedAddStreamLabels.remove(), stream.label());
assertEquals(expectedAddStreamLabels.remove(), stream.getId());
for (AudioTrack track : stream.audioTracks) {
assertEquals("audio", track.kind());
}
@ -248,7 +248,7 @@ public class PeerConnectionTest {
// TODO(bugs.webrtc.org/8491): Remove NoSynchronizedMethodCheck suppression.
@SuppressWarnings("NoSynchronizedMethodCheck")
public synchronized void onRemoveStream(MediaStream stream) {
assertEquals(expectedRemoveStreamLabels.remove(), stream.label());
assertEquals(expectedRemoveStreamLabels.remove(), stream.getId());
WeakReference<VideoRenderer> renderer = renderers.remove(stream);
assertNotNull(renderer);
assertNotNull(renderer.get());