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

Commit d6d5758f authored by Santiago Seifert's avatar Santiago Seifert Committed by Android (Google) Code Review
Browse files

Merge "Prevent NPE in MediaRouter2ServiceImpl#dump"

parents 7cb31203 ee516e36

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>");

            }

        }