commit fd3a3d79290799ec80c3bc9cfe965280428a8077
author Svetoslav <svetoslavganov@google.com> Fri Sep 05 17:10:05 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 05 17:10:06 2014 +0000
tree 28058d4c9d9bd40db8a947ac46bebe19a303ec0e
parent 527ecccce879471dd0096b72a4be584d35fe32d0
parent 4a361df54b0c00dfe730b29b879abcd836a5d85a

Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev

src/com/android/settings/print/PrintJobSettingsFragment.java

diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java
index cbe70ae..5af7f9d 100644
--- a/src/com/android/settings/print/PrintJobSettingsFragment.java
+++ b/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -153,18 +153,19 @@
     }
 
     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()) {