Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Treat all remotedocumentadapter-command results as cancel in the case we are canceling the command." into nyc-dev

Browse Source
This commit is contained in:
Philip P. Moltmann
2016-03-18 16:45:42 +00:00
committed by Android (Google) Code Review
parent 386f78530d 27db6611a7
commit ef5577a15d
1 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
packages/PrintSpooler/src/com/android/printspooler/model/RemotePrintDocument.java
View File

@@ -870,39 +870,56 @@ public final class RemotePrintDocument {
// AsyncCommand.AsyncCommandHandler#handleMessage
if (isFailed()) {
if (DEBUG) {
Log.i(LOG_TAG, "[CALLBACK] on canceled layout command");
Log.i(LOG_TAG, "[CALLBACK] on failed layout command");
}
return;
} else {
if (message.what != MSG_ON_LAYOUT_STARTED) {
// No need to force cancel anymore if layout finished
removeForceCancel();
}
}
switch (message.what) {
int sequence;
int what = message.what;
switch (what) {
case MSG_ON_LAYOUT_FINISHED:
removeForceCancel();
sequence = message.arg2;
break;
case MSG_ON_LAYOUT_FAILED:
case MSG_ON_LAYOUT_CANCELED:
removeForceCancel();
// $FALL-THROUGH - message uses the same format as "started"
case MSG_ON_LAYOUT_STARTED:
// Don't remote force-cancel as command is still running and might need to
// be canceled later
sequence = message.arg1;
break;
default:
// not reached
sequence = -1;
}
// If we are canceling any result is treated as a cancel
if (isCanceling() && what != MSG_ON_LAYOUT_STARTED) {
what = MSG_ON_LAYOUT_CANCELED;
}
switch (what) {
case MSG_ON_LAYOUT_STARTED: {
ICancellationSignal cancellation = (ICancellationSignal) message.obj;
final int sequence = message.arg1;
handleOnLayoutStarted(cancellation, sequence);
} break;
case MSG_ON_LAYOUT_FINISHED: {
PrintDocumentInfo info = (PrintDocumentInfo) message.obj;
final boolean changed = (message.arg1 == 1);
final int sequence = message.arg2;
handleOnLayoutFinished(info, changed, sequence);
} break;
case MSG_ON_LAYOUT_FAILED: {
CharSequence error = (CharSequence) message.obj;
final int sequence = message.arg1;
handleOnLayoutFailed(error, sequence);
} break;
case MSG_ON_LAYOUT_CANCELED: {
final int sequence = message.arg1;
handleOnLayoutCanceled(sequence);
} break;
}
@@ -1142,18 +1159,30 @@ public final class RemotePrintDocument {
// AsyncCommand.AsyncCommandHandler#handleMessage
if (isFailed()) {
if (DEBUG) {
Log.i(LOG_TAG, "[CALLBACK] on canceled write command");
Log.i(LOG_TAG, "[CALLBACK] on failed write command");
}
return;
} else {
if (message.what != MSG_ON_WRITE_STARTED) {
// No need to force cancel anymore if write finished
removeForceCancel();
}
}
switch (message.what) {
int what = message.what;
switch (what) {
case MSG_ON_WRITE_FINISHED:
case MSG_ON_WRITE_FAILED:
case MSG_ON_WRITE_CANCELED:
removeForceCancel();
case MSG_ON_WRITE_STARTED:
// Don't remote force-cancel as command is still running and might need to
// be canceled later
break;
}
// If we are canceling any result is treated as a cancel
if (isCanceling() && what != MSG_ON_WRITE_STARTED) {
what = MSG_ON_WRITE_CANCELED;
}
switch (what) {
case MSG_ON_WRITE_STARTED: {
ICancellationSignal cancellation = (ICancellationSignal) message.obj;
final int sequence = message.arg1;