Merge "Add NPE protection to NextAlarmController dump" into sc-qpr1-dev

This commit is contained in:
TreeHugger Robot
2021-09-13 16:22:56 +00:00
committed by Android (Google) Code Review

View File

@@ -71,7 +71,11 @@ public class NextAlarmControllerImpl extends BroadcastReceiver
if (mNextAlarm != null) { if (mNextAlarm != null) {
pw.println(new Date(mNextAlarm.getTriggerTime())); pw.println(new Date(mNextAlarm.getTriggerTime()));
pw.print(" PendingIntentPkg="); pw.print(" PendingIntentPkg=");
pw.println(mNextAlarm.getShowIntent().getCreatorPackage()); if (mNextAlarm.getShowIntent() != null) {
pw.println(mNextAlarm.getShowIntent().getCreatorPackage());
} else {
pw.println("showIntent=null");
}
} else { } else {
pw.println("null"); pw.println("null");
} }