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

Commit c57c44d7 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 1d1ebed3: am 62110657: am b99419aa: am 27f80673: am ea496644: Merge "Add... 

am 1d1ebed3: am 62110657: am b99419aa: am 27f80673: am ea496644: Merge "Add null check" into lmp-dev

* commit '1d1ebed3':
  Add null check
parents c03379a0 1d1ebed3

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

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

                    pw.print(" resultWho="); pw.print(resultWho);

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

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

        }

        }

        if (taskDescription != null) {

            final String iconFilename = taskDescription.getIconFilename();

            final String iconFilename = taskDescription.getIconFilename();

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

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

                    taskDescription.getPrimaryColor() != 0) {

                    taskDescription.getPrimaryColor() != 0) {

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

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

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

                        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.print(" color=");

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

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

            }

            }

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

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

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

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

            }

            }

        }

        if (results != null) {

        if (results != null) {

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

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

        }

        }