From ee516e366dda870a482f1d526e295127df764b27 Mon Sep 17 00:00:00 2001
From: Santiago Seifert <aquilescanta@google.com>
Date: Thu, 22 Sep 2022 19:08:27 +0000
Subject: [PATCH] Prevent NPE in MediaRouter2ServiceImpl#dump

Replaces a use of get (expects the id) with valueAt, which
expects an index.

Also simplify anonymous runnable by using a lambda.

Bug: 243116883
Test: adb shell dumpsys media_router
Change-Id: Ib84a58bf1675ef2e60ca384a8e617e27f4ddd7de
---
 .../android/server/media/MediaRouter2ServiceImpl.java    | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
index 92a63295f8a41..82b5c11cfb8ca 100644
--- a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
+++ b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
@@ -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>");
             }
         }