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

Merge "Prevent NPE in MediaRouter2ServiceImpl#dump"

Browse Source
This commit is contained in:
Santiago Seifert
2022-09-23 08:51:01 +00:00
committed by Android (Google) Code Review
parent 7cb312031a ee516e366d
commit d6d5758fb8
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
View File

@@ -613,7 +613,7 @@ class MediaRouter2ServiceImpl {
pw.println(indent + "UserRecords:");
if (mUserRecords.size() > 0) {
for (int i = 0; i < mUserRecords.size(); i++) {
mUserRecords.get(i).dump(pw, indent + " ");
mUserRecords.valueAt(i).dump(pw, indent + " ");
}
} else {
pw.println(indent + "<no user records>");
@@ -1243,12 +1243,7 @@ class MediaRouter2ServiceImpl {
pw.println(indent + "<no manager records>");
}
if (!mHandler.runWithScissors(new Runnable() {
@Override
public void run() {
mHandler.dump(pw, indent);
}
}, 1000)) {
if (!mHandler.runWithScissors(() -> mHandler.dump(pw, indent), 1000)) {
pw.println(indent + "<could not dump handler state>");
}
}