summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/print
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2013-10-01 21:30:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-01 21:30:36 +0000
commitff75201aee750f76372b95ff8ac08d81cb738c7c (patch)
treea21afa60ee9587b9c94d5503e8ef01ab55935e05 /src/com/android/settings/print
parentc120c6cf9f86ae56d98b2d6e22f68626b1b1665c (diff)
parentdc00bf648338386e11ece255a8e7ce29ea3a70ab (diff)
downloadpackages_apps_Settings-ff75201aee750f76372b95ff8ac08d81cb738c7c.tar.gz
packages_apps_Settings-ff75201aee750f76372b95ff8ac08d81cb738c7c.tar.bz2
packages_apps_Settings-ff75201aee750f76372b95ff8ac08d81cb738c7c.zip
Merge "Missing return statement if a print job is no longer present." into klp-dev
Diffstat (limited to 'src/com/android/settings/print')
-rw-r--r--src/com/android/settings/print/PrintJobSettingsFragment.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java
index 99499c85e..b4d517ddb 100644
--- 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();