diff options
author | Svetoslav <svetoslavganov@google.com> | 2013-10-31 21:42:06 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-31 21:42:06 +0000 |
commit | 6ce161d1762a1c74b1ed6931c1d54f1f553267b0 (patch) | |
tree | a99fb93ab0c7689fcc66f9154ec5d36c977d01ee /packages | |
parent | 5747919fed5180956387c50cb03671b9e67be1d5 (diff) | |
parent | d270cb9264f762257d1aadbeba9c4b38866e171c (diff) | |
download | frameworks_base-6ce161d1762a1c74b1ed6931c1d54f1f553267b0.zip frameworks_base-6ce161d1762a1c74b1ed6931c1d54f1f553267b0.tar.gz frameworks_base-6ce161d1762a1c74b1ed6931c1d54f1f553267b0.tar.bz2 |
Merge "Cancel current work in PrintDocumentAdatper if printing is cancelled." into klp-dev
Diffstat (limited to 'packages')
-rw-r--r-- | packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java | 3 | ||||
-rw-r--r-- | packages/PrintSpooler/src/com/android/printspooler/RemotePrintDocumentAdapter.java | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java b/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java index 8f26361..6d0ecd7 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java +++ b/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java @@ -357,6 +357,9 @@ public class PrintJobConfigActivity extends Activity { } public void cancel() { + if (isWorking()) { + mRemotePrintAdapter.cancel(); + } mControllerState = CONTROLLER_STATE_CANCELLED; } diff --git a/packages/PrintSpooler/src/com/android/printspooler/RemotePrintDocumentAdapter.java b/packages/PrintSpooler/src/com/android/printspooler/RemotePrintDocumentAdapter.java index fd14af9..d9ccb5d 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/RemotePrintDocumentAdapter.java +++ b/packages/PrintSpooler/src/com/android/printspooler/RemotePrintDocumentAdapter.java @@ -137,4 +137,15 @@ final class RemotePrintDocumentAdapter { Log.e(LOG_TAG, "Error calling finish()", re); } } + + public void cancel() { + if (DEBUG) { + Log.i(LOG_TAG, "cancel()"); + } + try { + mRemoteInterface.cancel(); + } catch (RemoteException re) { + Log.e(LOG_TAG, "Error calling cancel()", re); + } + } } |