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

Commit cccd9b00 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avoid NullPointerException in MediaRouterService" into tm-dev am:... 

Merge "Avoid NullPointerException in MediaRouterService" into tm-dev am: 3f58f816 am: db81d6b9 am: 0141f5ba

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18436784



Change-Id: Iba139286d853450472edd2c8850393483592206f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b480f3c 0141f5ba

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;