Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I6a489741c9787cb2fd52bf04ab5106c54c68e04f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-18 21:43:48 +00:00
committed by Automerger Merge Worker
parent 800ea4541c 3f58f8161f
commit db81d6b946
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/media/MediaRouterService.java
View File

@@ -566,7 +566,9 @@ public final class MediaRouterService extends IMediaRouterService.Stub
boolean setDeviceRouteSelected = false; boolean setDeviceRouteSelected = false;
synchronized (mLock) { synchronized (mLock) {
UserRecord userRecord = mUserRecords.get(userId); 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 (TextUtils.equals(clientRecord.mPackageName, packageName)) {
if (mDefaultAudioRouteId.equals(clientRecord.mSelectedRouteId)) { if (mDefaultAudioRouteId.equals(clientRecord.mSelectedRouteId)) {
setDeviceRouteSelected = true; setDeviceRouteSelected = true;