am 42c1c428: am 1c46bae1: am d972e2df: Merge "Print UI stuck when backing out of documents UI." into lmp-dev

* commit '42c1c4289cf5c693a407a35f8d1a8dfbfe4e1fd4':
  Print UI stuck when backing out of documents UI.
This commit is contained in:
Svetoslav
2014-09-18 21:17:53 +00:00
committed by Android Git Automerger

View File

@@ -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