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

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

am 3c419da6: am dbbfa702: Fix MediaRouter bugs 

* commit '3c419da6':
  Fix MediaRouter bugs
parents a5710198 3c419da6

media/java/android/media/MediaRouter.java

+2 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ public class MediaRouter { 
        for (int i = 0; i < count; i++) {

            final CallbackInfo info = sStatic.mCallbacks.get(i);

            if (info.cb == cb) {

                info.type &= types;

                info.type |= types;

                return;

            }

        }
@@ -342,6 +342,7 @@ public class MediaRouter { 
        if (cat.isGroupable() && !(info instanceof RouteGroup)) {

            // Enforce that any added route in a groupable category must be in a group.

            final RouteGroup group = new RouteGroup(info.getCategory());

            group.mSupportedTypes = info.mSupportedTypes;

            sStatic.mRoutes.add(group);

            dispatchRouteAdded(group);

            group.addRoute(info);