Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee516e36 authored by Santiago Seifert's avatar Santiago Seifert
Browse files

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
parent 4f31d4f9

services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java

+2 −7
Original line number Diff line number Diff line
@@ -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>");

            }

        }