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

Commit 695d23e9 authored by Antony Sargent's avatar Antony Sargent Committed by Android (Google) Code Review
Browse files

Merge "Avoid NPE in rare cases in CTS tests" into main

parents 0a1c1e5d aeff6da5

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

+3 −0
Original line number Diff line number Diff line
@@ -344,6 +344,9 @@ abstract class MediaRoute2Provider { 
        if (!Flags.enableRouteVisibilityControlCompatFixes()) {

            return;

        }

        if (mProviderInfo == null) {

            return;  // no need to update provider state if we don't have any

        }

        List<MediaRoute2Info> possiblyUpdatedRoutes =

                getVisibilityUpdatedRoutesIfNeeded(mProviderInfo.getRoutes(), mSessionInfos);

        if (possiblyUpdatedRoutes != null) {