MediaRouter: Hide the group API per request

Bug: 24831500
Change-Id: I523012153a3bfe2c752f94a73d2425a100335816
diff --git a/v7/mediarouter/api/current.txt b/v7/mediarouter/api/current.txt
index 69fc20e..92bbbb3 100644
--- a/v7/mediarouter/api/current.txt
+++ b/v7/mediarouter/api/current.txt
@@ -386,7 +386,6 @@
     method public java.lang.String getDescription();
     method public int getDeviceType();
     method public android.os.Bundle getExtras();
-    method public java.util.List<java.lang.String> getGroupMemberIds();
     method public android.net.Uri getIconUri();
     method public java.lang.String getId();
     method public java.lang.String getName();
@@ -407,8 +406,6 @@
     ctor public MediaRouteDescriptor.Builder(android.support.v7.media.MediaRouteDescriptor);
     method public android.support.v7.media.MediaRouteDescriptor.Builder addControlFilter(android.content.IntentFilter);
     method public android.support.v7.media.MediaRouteDescriptor.Builder addControlFilters(java.util.Collection<android.content.IntentFilter>);
-    method public android.support.v7.media.MediaRouteDescriptor.Builder addGroupMemberId(java.lang.String);
-    method public android.support.v7.media.MediaRouteDescriptor.Builder addGroupMemberIds(java.util.Collection<java.lang.String>);
     method public android.support.v7.media.MediaRouteDescriptor build();
     method public android.support.v7.media.MediaRouteDescriptor.Builder setCanDisconnect(boolean);
     method public deprecated android.support.v7.media.MediaRouteDescriptor.Builder setConnecting(boolean);
@@ -576,12 +573,6 @@
     method public java.util.List<android.support.v7.media.MediaRouter.RouteInfo> getRoutes();
   }
 
-  public static class MediaRouter.RouteGroup extends android.support.v7.media.MediaRouter.RouteInfo {
-    method public android.support.v7.media.MediaRouter.RouteInfo getRouteAt(int);
-    method public int getRouteCount();
-    method public java.util.List<android.support.v7.media.MediaRouter.RouteInfo> getRoutes();
-  }
-
   public static class MediaRouter.RouteInfo {
     method public boolean canDisconnect();
     method public int getConnectionState();
diff --git a/v7/mediarouter/src/android/support/v7/media/MediaRouteDescriptor.java b/v7/mediarouter/src/android/support/v7/media/MediaRouteDescriptor.java
index b067d03..97a2cd7 100644
--- a/v7/mediarouter/src/android/support/v7/media/MediaRouteDescriptor.java
+++ b/v7/mediarouter/src/android/support/v7/media/MediaRouteDescriptor.java
@@ -83,6 +83,7 @@
      * A route descriptor that has one or more group member route ids
      * represents a route group. A member route may belong to another group.
      * </p>
+     * @hide
      */
     public List<String> getGroupMemberIds() {
         return mBundle.getStringArrayList(KEY_GROUP_MEMBER_IDS);
@@ -380,6 +381,7 @@
          * A route descriptor that has one or more group member route ids
          * represents a route group. A member route may belong to another group.
          * </p>
+         * @hide
          */
         public Builder addGroupMemberId(String groupMemberId) {
             if (TextUtils.isEmpty(groupMemberId)) {
@@ -401,6 +403,7 @@
          * A route descriptor that has one or more group member route ids
          * represents a route group. A member route may belong to another group.
          * </p>
+         * @hide
          */
         public Builder addGroupMemberIds(Collection<String> groupMemberIds) {
             if (groupMemberIds == null) {
diff --git a/v7/mediarouter/src/android/support/v7/media/MediaRouter.java b/v7/mediarouter/src/android/support/v7/media/MediaRouter.java
index 27d8303..18bcc85 100644
--- a/v7/mediarouter/src/android/support/v7/media/MediaRouter.java
+++ b/v7/mediarouter/src/android/support/v7/media/MediaRouter.java
@@ -1491,6 +1491,7 @@
 
     /**
      * Information about a route that consists of multiple other routes in a group.
+     * @hide
      */
     public static class RouteGroup extends RouteInfo {
         private List<RouteInfo> mRoutes = new ArrayList<>();