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

Commit 3d714f78 authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Avoid NullPointerException in MediaRouterService 

Bug: 226010483
Test: atest CtsMediaBetterTogetherTestCases
Change-Id: I0faa17c4b0786ecdfb08941ac8193fc969f12939
parent 6a45e90f

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

+3 −1
Original line number Diff line number Diff line
@@ -566,7 +566,9 @@ public final class MediaRouterService extends IMediaRouterService.Stub 
        boolean setDeviceRouteSelected = false;

        synchronized (mLock) {

            UserRecord userRecord = mUserRecords.get(userId);

            for (ClientRecord clientRecord : userRecord.mClientRecords) {

            List<ClientRecord> userClientRecords =

                    userRecord != null ? userRecord.mClientRecords : Collections.emptyList();

            for (ClientRecord clientRecord : userClientRecords) {

                if (TextUtils.equals(clientRecord.mPackageName, packageName)) {

                    if (mDefaultAudioRouteId.equals(clientRecord.mSelectedRouteId)) {

                        setDeviceRouteSelected = true;