Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev

Author: adamp

core/java/android/app/MediaRouteButton.java

@@ -374,5 +374,16 @@ public void onRouteAdded(MediaRouter router, RouteInfo info) {
         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();
+        }
     }
 }

media/java/android/media/MediaRouter.java

@@ -1152,8 +1152,8 @@ public void addRoute(RouteInfo route) {
             route.mGroup = this;
             mUpdateName = true;
             updateVolume();
-            dispatchRouteGrouped(route, this, at);
             routeUpdated();
+            dispatchRouteGrouped(route, this, at);
         }
 
         /**
@@ -1176,8 +1176,8 @@ public void addRoute(RouteInfo route, int insertAt) {
             route.mGroup = this;
             mUpdateName = true;
             updateVolume();
-            dispatchRouteGrouped(route, this, insertAt);
             routeUpdated();
+            dispatchRouteGrouped(route, this, insertAt);
         }
 
         /**