diff options
| author | Craig Mautner <cmautner@google.com> | 2014-10-14 23:35:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-14 23:35:35 +0000 |
| commit | ea4966442cd035e592aa73c0c29225efe3f091fb (patch) | |
| tree | 6369817152b0c6330d1ba54ac56fdcc865b00218 /services/core | |
| parent | f97e71a6ddbaea2ffcba9f528e8cb43ee2ada40a (diff) | |
| parent | 29c58cad4ef8a14ec0a723318a92da85c8325c88 (diff) | |
| download | frameworks_base-ea4966442cd035e592aa73c0c29225efe3f091fb.zip frameworks_base-ea4966442cd035e592aa73c0c29225efe3f091fb.tar.gz frameworks_base-ea4966442cd035e592aa73c0c29225efe3f091fb.tar.bz2 | |
Merge "Add null check" into lmp-dev
Diffstat (limited to 'services/core')
| -rwxr-xr-x | services/core/java/com/android/server/am/ActivityRecord.java | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java index 198273e..1a0e45e 100755 --- a/services/core/java/com/android/server/am/ActivityRecord.java +++ b/services/core/java/com/android/server/am/ActivityRecord.java @@ -205,17 +205,20 @@ final class ActivityRecord { pw.print(" resultWho="); pw.print(resultWho); pw.print(" resultCode="); pw.println(requestCode); } - 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(" color="); - pw.println(Integer.toHexString(taskDescription.getPrimaryColor())); - } - if (iconFilename == null && taskDescription.getIcon() != null) { - pw.print(prefix); pw.println("taskDescription contains Bitmap"); + 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(" 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); |