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

Commit b3fbcb29 authored by Craig Mautner's avatar Craig Mautner Committed by The Android Automerger
Browse files

Add null check 

Unable to examine bugreports that die in the middle of dump().

Help for bug 17721767.

Change-Id: I31a5e03acf67c926a1cbfefe2a7ea7fca3b71b06
parent 2ac7f9cf

services/core/java/com/android/server/am/ActivityRecord.java

+14 −11
Original line number Diff line number Diff line
@@ -205,18 +205,21 @@ final class ActivityRecord { 
                    pw.print(" resultWho="); pw.print(resultWho);

                    pw.print(" resultCode="); pw.println(requestCode);

        }

        if (taskDescription != null) {

            final String iconFilename = taskDescription.getIconFilename();

            if (iconFilename != null || taskDescription.getLabel() != null ||

                    taskDescription.getPrimaryColor() != 0) {

                pw.print(prefix); pw.print("taskDescription:");

                        pw.print(" iconFilename="); pw.print(taskDescription.getIconFilename());

                    pw.print(" label=\""); pw.print(taskDescription.getLabel()); pw.print("\"");

                        pw.print(" label=\""); pw.print(taskDescription.getLabel());

                                pw.print("\"");

                        pw.print(" color=");

                        pw.println(Integer.toHexString(taskDescription.getPrimaryColor()));

            }

            if (iconFilename == null && taskDescription.getIcon() != null) {

                pw.print(prefix); pw.println("taskDescription contains Bitmap");

            }

        }

        if (results != null) {

            pw.print(prefix); pw.print("results="); pw.println(results);

        }