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

Commit c8ac5ede authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check mBtRouteProvider for null before calling methods on it" into... 

Merge "Check mBtRouteProvider for null before calling methods on it" into rvc-dev am: 7da79bf2 am: dc87e297

Change-Id: Iefaafbe852c07f5d2d0190be3ec1455d08ff4389
parents ecb153f3 dc87e297

services/core/java/com/android/server/media/SystemMediaRoute2Provider.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -261,9 +261,11 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider { 
                    .build();

                    .build();

            builder.addSelectedRoute(mSelectedRouteId);

            builder.addSelectedRoute(mSelectedRouteId);





            if (mBtRouteProvider != null) {

                for (MediaRoute2Info route : mBtRouteProvider.getTransferableRoutes()) {

                for (MediaRoute2Info route : mBtRouteProvider.getTransferableRoutes()) {

                    builder.addTransferableRoute(route.getId());

                    builder.addTransferableRoute(route.getId());

                }

                }

            }





            RoutingSessionInfo newSessionInfo = builder.setProviderId(mUniqueId).build();

            RoutingSessionInfo newSessionInfo = builder.setProviderId(mUniqueId).build();

            if (Objects.equals(oldSessionInfo, newSessionInfo)) {

            if (Objects.equals(oldSessionInfo, newSessionInfo)) {