Update route count properly when MediaRouteButton detects

grouped/ungrouped events

Change-Id: I1b00678cc3b548f347c51c3fcbfce18ecc8fbabe

diff --git a/core/java/android/app/MediaRouteButton.java b/core/java/android/app/MediaRouteButton.java
index 65f9f87..c34c163 100644 (file)
--- a/core/java/android/app/MediaRouteButton.java
+++ b/core/java/android/app/MediaRouteButton.java
@@ -374,5 +374,16 @@ public class MediaRouteButton extends View {
         public void onRouteRemoved(MediaRouter router, RouteInfo info) {
             updateRouteCount();
         }
+
+        @Override
+        public void onRouteGrouped(MediaRouter router, RouteInfo info, RouteGroup group,
+                int index) {
+            updateRouteCount();
+        }
+
+        @Override
+        public void onRouteUngrouped(MediaRouter router, RouteInfo info, RouteGroup group) {
+            updateRouteCount();
+        }
     }
 }

diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java
index fe261cf..8a9a764 100644 (file)
--- a/media/java/android/media/MediaRouter.java
+++ b/media/java/android/media/MediaRouter.java
@@ -1152,8 +1152,8 @@ public class MediaRouter {
             route.mGroup = this;
             mUpdateName = true;
             updateVolume();
-            dispatchRouteGrouped(route, this, at);
             routeUpdated();
+            dispatchRouteGrouped(route, this, at);
         }
 
         /**
@@ -1176,8 +1176,8 @@ public class MediaRouter {
             route.mGroup = this;
             mUpdateName = true;
             updateVolume();
-            dispatchRouteGrouped(route, this, insertAt);
             routeUpdated();
+            dispatchRouteGrouped(route, this, insertAt);
         }
 
         /**