drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add null check" into lmp-dev

Browse Source
This commit is contained in:
Craig Mautner
2014-10-14 23:35:31 +00:00
committed by Android (Google) Code Review
parent f97e71a6dd 29c58cad4e
commit ea4966442c
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/ActivityRecord.java
View File

@ -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);
} }