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

Commit 0a5ea805 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 rvc-dev am: 7da79bf2 

Change-Id: Ie4a7f3c92c81b87ec6ad467da93768b919458d95
parents 41d1d4da 7da79bf2

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