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

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

Merge "Avoid NullPointerException in MediaRouterService" into tm-dev

parents 61a7196f 3d714f78

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;