Merge "Allow ungrouping media routes when a group is the only alternate route" into jb-dev

1 files changed, 8 insertions, 2 deletions

diff --git a/core/java/android/app/MediaRouteButton.java b/core/java/android/app/MediaRouteButton.java
index 18713f5..5863ad0 100644
--- a/core/java/android/app/MediaRouteButton.java
+++ b/core/java/android/app/MediaRouteButton.java
@@ -25,6 +25,7 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.media.MediaRouter;
+import android.media.MediaRouter.RouteGroup;
 import android.media.MediaRouter.RouteInfo;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -157,8 +158,13 @@ public class MediaRouteButton extends View {
         final int N = mRouter.getRouteCount();
         int count = 0;
         for (int i = 0; i < N; i++) {
-            if ((mRouter.getRouteAt(i).getSupportedTypes() & mRouteTypes) != 0) {
-                count++;
+            final RouteInfo route = mRouter.getRouteAt(i);
+            if ((route.getSupportedTypes() & mRouteTypes) != 0) {
+                if (route instanceof RouteGroup) {
+                    count += ((RouteGroup) route).getRouteCount();
+                } else {
+                    count++;
+                }
             }
         }