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 userClientRecords = + userRecord != null ? userRecord.mClientRecords : Collections.emptyList(); + for (ClientRecord clientRecord : userClientRecords) { if (TextUtils.equals(clientRecord.mPackageName, packageName)) { if (mDefaultAudioRouteId.equals(clientRecord.mSelectedRouteId)) { setDeviceRouteSelected = true;