Merge "Print UI stuck when backing out of documents UI." into lmp-dev

2014-09-18 20:34:22 +00:00
parent 07ecc748fb b75632c736
commit 688a994f4d
1 changed files with 2 additions and 2 deletions
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
@@ -595,7 +595,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
                }
            });
        } else if (resultCode == RESULT_CANCELED) {
-            setState(STATE_CONFIGURING);
+            mState = STATE_CONFIGURING;
            updateOptionsUi();
        } else {
            setState(STATE_CREATE_FILE_FAILED);
@@ -2335,7 +2335,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
                    mContext.unbindService(PageShredder.this);
                    mCallback.run();
                }
-            }.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR);
+            }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
        }

        @Override