diff options
| author | Svetoslav <svetoslavganov@google.com> | 2014-09-18 20:34:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-18 20:34:23 +0000 |
| commit | 688a994f4d156db6a9310c438545f014accba5ed (patch) | |
| tree | 500c5a78eaece27b219e63cf7ea8a1bd77d0a233 | |
| parent | 07ecc748fb378a1acb86f3b93a7ad35d8fbb5aa5 (diff) | |
| parent | b75632c7366d3c848a5d31782d9942dd2818adcb (diff) | |
| download | frameworks_base-688a994f4d156db6a9310c438545f014accba5ed.zip frameworks_base-688a994f4d156db6a9310c438545f014accba5ed.tar.gz frameworks_base-688a994f4d156db6a9310c438545f014accba5ed.tar.bz2 | |
Merge "Print UI stuck when backing out of documents UI." into lmp-dev
| -rw-r--r-- | packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java index d169319..c4b3262 100644 --- 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 |