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

Avoid NullPointerException in MediaRouterService

Browse Source 
Bug: 226010483
Test: atest CtsMediaBetterTogetherTestCases
Change-Id: I0faa17c4b0786ecdfb08941ac8193fc969f12939
This commit is contained in:
Santiago Seifert
2022-05-13 15:36:52 +00:00
parent 6a45e90f9f
commit 3d714f7872
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;
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;