Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b939b72 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am fd3fd482: Merge "Update route count properly when MediaRouteButton detects... 

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

* commit 'fd3fd482':
  Update route count properly when MediaRouteButton detects grouped/ungrouped events
parents b9975454 fd3fd482

core/java/android/app/MediaRouteButton.java

+11 −0
Original line number Diff line number Diff line
@@ -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();

        }

    }

}

media/java/android/media/MediaRouter.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

        }



        /**