summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2014-09-05 17:10:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-05 17:10:06 +0000
commitfd3a3d79290799ec80c3bc9cfe965280428a8077 (patch)
tree28058d4c9d9bd40db8a947ac46bebe19a303ec0e
parent527ecccce879471dd0096b72a4be584d35fe32d0 (diff)
parent4a361df54b0c00dfe730b29b879abcd836a5d85a (diff)
downloadpackages_apps_Settings-fd3a3d79290799ec80c3bc9cfe965280428a8077.tar.gz
packages_apps_Settings-fd3a3d79290799ec80c3bc9cfe965280428a8077.tar.bz2
packages_apps_Settings-fd3a3d79290799ec80c3bc9cfe965280428a8077.zip
Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev
-rw-r--r--src/com/android/settings/print/PrintJobSettingsFragment.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java
index cbe70ae6f..5af7f9dda 100644
--- a/src/com/android/settings/print/PrintJobSettingsFragment.java
+++ b/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -153,18 +153,19 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment {
}
private void updateUi() {
- mPrintJob = mPrintManager.getPrintJob(mPrintJobId);
+ PrintJob printJob = mPrintManager.getPrintJob(mPrintJobId);
- if (mPrintJob == null) {
+ if (printJob == null) {
finish();
return;
}
- if (mPrintJob.isCancelled() || mPrintJob.isCompleted()) {
+ if (printJob.isCancelled() || printJob.isCompleted()) {
finish();
return;
}
+ mPrintJob = printJob;
PrintJobInfo info = mPrintJob.getInfo();
switch (info.getState()) {