am 6e52e742: am 94e2d608: am 9208a81b: Merge "Page shredder callback invoked on the wrong thread." into lmp-dev

* commit '6e52e742d1e2bd0fece88d114d57ce388ba88157':
  Page shredder callback invoked on the wrong thread.

1 files changed, 12 insertions, 12 deletions

diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
index 7574fca..693e5ac 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
@@ -61,7 +61,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
 import android.view.ViewGroup;
-import android.view.accessibility.AccessibilityEvent;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
@@ -2304,19 +2303,20 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
             new AsyncTask<Void, Void, Void>() {
                 @Override
                 protected Void doInBackground(Void... params) {
-                    try {
-                        // It's OK to access the data members as they are
-                        // final and this code is the last one to touch
-                        // them as shredding is the very last step, so the
-                        // UI is not interactive at this point.
-                        shredPages(editor);
-                        updatePrintJob();
-                    } finally {
-                        mContext.unbindService(PageShredder.this);
-                        mCallback.run();
-                    }
+                    // It's OK to access the data members as they are
+                    // final and this code is the last one to touch
+                    // them as shredding is the very last step, so the
+                    // UI is not interactive at this point.
+                    shredPages(editor);
+                    updatePrintJob();
                     return null;
                 }
+
+                @Override
+                protected void onPostExecute(Void aVoid) {
+                    mContext.unbindService(PageShredder.this);
+                    mCallback.run();
+                }
             }.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR);
         }