From 73c9b9f0ea6e2049bc3f1dc9ec92c820686efb4a Mon Sep 17 00:00:00 2001
From: Kyunglyul Hyun <klhyun@google.com>
Date: Mon, 2 Mar 2020 15:39:53 +0900
Subject: [PATCH] MediaRouter2: Fix javadoc

Add a disclamer and cleanups some comments.
Add a link to AndroidX media router.

Bug: 150291987
Test: N/A
Change-Id: I6ba5505b52a256ac4ee30b087524f2a4263e8df7
---
 media/java/android/media/MediaRouter2.java       | 5 +++++
 media/java/android/media/RoutingSessionInfo.java | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/media/java/android/media/MediaRouter2.java b/media/java/android/media/MediaRouter2.java
index 68df7d2b192ef..1fb30d02d60f2 100644
--- a/media/java/android/media/MediaRouter2.java
+++ b/media/java/android/media/MediaRouter2.java
@@ -47,6 +47,11 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
+ * This API is not generally intended for third party application developers.
+ * Use the <a href="{@docRoot}jetpack/androidx.html">AndroidX</a>
+  <a href="{@docRoot}reference/androidx/mediarouter/media/package-summary.html">Media Router
+ * Library</a> for consistent behavior across all devices.
+ *
  * Media Router 2 allows applications to control the routing of media channels
  * and streams from the current device to remote speakers and devices.
  */
diff --git a/media/java/android/media/RoutingSessionInfo.java b/media/java/android/media/RoutingSessionInfo.java
index 9d81fbbb793a8..9b5a2cd9ead8f 100644
--- a/media/java/android/media/RoutingSessionInfo.java
+++ b/media/java/android/media/RoutingSessionInfo.java
@@ -369,7 +369,6 @@ public final class RoutingSessionInfo implements Parcelable {
         Bundle mControlHints;
         boolean mIsSystemSession;
 
-        //TODO: Remove this.
         /**
          * Constructor for builder to create {@link RoutingSessionInfo}.
          * <p>