am 1426c36f: am ff75201a: Merge "Missing return statement if a print job is no longer present." into klp-dev

* commit '1426c36ff9d377cdf843940f2ecd0bbab07a9cbb': Missing return statement if a print job is no longer present.
2013-10-02 09:56:29 -07:00
parent 1f7bac2ba9 1426c36ff9
commit 08f800ac98
1 changed files with 2 additions and 0 deletions
--- a/src/com/android/settings/print/PrintJobSettingsFragment.java
+++ b/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -153,10 +153,12 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment {

        if (mPrintJob == null) {
            finish();
+            return;
        }

        if (mPrintJob.isCancelled() || mPrintJob.isCompleted()) {
            finish();
+            return;
        }

        PrintJobInfo info = mPrintJob.getInfo();