From 43835e006e2988f05ad30fb926ed958a832785c1 Mon Sep 17 00:00:00 2001 From: Svetoslav Date: Fri, 19 Sep 2014 14:15:48 -0700 Subject: [PATCH] Crash in Settings cancelling a print job from the job list. bug:17585582 Change-Id: I44aef7e09c26141388b410762e93164d8df9a0c6 --- .../android/settings/print/PrintJobSettingsFragment.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java index a72fa7d91f9..34db97b7819 100644 --- a/src/com/android/settings/print/PrintJobSettingsFragment.java +++ b/src/com/android/settings/print/PrintJobSettingsFragment.java @@ -112,13 +112,18 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); - if (!getPrintJob().getInfo().isCancelling()) { + PrintJob printJob = getPrintJob(); + if (printJob == null) { + return; + } + + if (!printJob.getInfo().isCancelling()) { MenuItem cancel = menu.add(0, MENU_ITEM_ID_CANCEL, Menu.NONE, getString(R.string.print_cancel)); cancel.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); } - if (getPrintJob().isFailed()) { + if (printJob.isFailed()) { MenuItem restart = menu.add(0, MENU_ITEM_ID_RESTART, Menu.NONE, getString(R.string.print_restart)); restart.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);