diff options
| author | Svetoslav <svetoslavganov@google.com> | 2014-09-18 20:57:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-18 20:57:34 +0000 |
| commit | f14783bc511f0853912b0edd3c884b47dffc525c (patch) | |
| tree | b3a4e4fc67ff9f72fd7faef4c3487b76c4158870 /packages/PrintSpooler | |
| parent | 97f23981fcb87f193e9c751f9cb7049c859842e2 (diff) | |
| parent | 11549dd25884973f2ea7a906c6e20cb375ac60d6 (diff) | |
| download | frameworks_base-f14783bc511f0853912b0edd3c884b47dffc525c.zip frameworks_base-f14783bc511f0853912b0edd3c884b47dffc525c.tar.gz frameworks_base-f14783bc511f0853912b0edd3c884b47dffc525c.tar.bz2 | |
am 5fe3bb76: am d972e2df: Merge "Print UI stuck when backing out of documents UI." into lmp-dev
* commit '5fe3bb76eb26707b096e20565a39fd3963c47134':
Print UI stuck when backing out of documents UI.
Diffstat (limited to 'packages/PrintSpooler')
| -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 |