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());