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

Commit 7da79bf2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Check mBtRouteProvider for null before calling methods on it" into rvc-dev

parents d2bd6bae 39961301

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

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

            builder.addSelectedRoute(mSelectedRouteId);



            if (mBtRouteProvider != null) {

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

                    builder.addTransferableRoute(route.getId());

                }

            }



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

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