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

Commit fd3fd482 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Update route count properly when MediaRouteButton detects... 

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

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);

        }



        /**