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

Commit 453f429f 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 am: c8ac5ede am: be327f36 am: 87c16d8f

Change-Id: Id56bcc885de655a46e4786c1d4720868ef7c7e5e
parents 06a81a7a 87c16d8f

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