From 3d714f7872d801f0dc333db7b7bd8538e39ebf0f Mon Sep 17 00:00:00 2001
From: Santiago Seifert <aquilescanta@google.com>
Date: Fri, 13 May 2022 15:36:52 +0000
Subject: [PATCH] Avoid NullPointerException in MediaRouterService

Bug: 226010483
Test: atest CtsMediaBetterTogetherTestCases
Change-Id: I0faa17c4b0786ecdfb08941ac8193fc969f12939
---
 .../java/com/android/server/media/MediaRouterService.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/media/MediaRouterService.java b/services/core/java/com/android/server/media/MediaRouterService.java
index d4af681b97b50..e61f55381b0c7 100644
--- a/services/core/java/com/android/server/media/MediaRouterService.java
+++ b/services/core/java/com/android/server/media/MediaRouterService.java
@@ -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;