From 7ba2e19c1717373b19be05aa21376589455d8618 Mon Sep 17 00:00:00 2001 From: Seth Hampson Date: Wed, 18 Apr 2018 09:29:34 -0700 Subject: [PATCH] Removing deprecated label() that is no longer used. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:8977 Change-Id: Ic1e4d0b83b1379fd5269240842eeb52f86f56cdb Reviewed-on: https://webrtc-review.googlesource.com/65880 Commit-Queue: Seth Hampson Reviewed-by: Benjamin Wright Reviewed-by: Sami Kalliomäki Cr-Commit-Position: refs/heads/master@{#22925} --- sdk/android/api/org/webrtc/MediaStream.java | 6 ------ .../src/org/webrtc/PeerConnectionTest.java | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/sdk/android/api/org/webrtc/MediaStream.java b/sdk/android/api/org/webrtc/MediaStream.java index e04fabdd85..459c128a9b 100644 --- a/sdk/android/api/org/webrtc/MediaStream.java +++ b/sdk/android/api/org/webrtc/MediaStream.java @@ -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); } diff --git a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java index 8272830a92..d916145ee6 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java @@ -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 renderer = renderers.remove(stream); assertNotNull(renderer); assertNotNull(renderer.get());