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 /core | |
| 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 'core')
| -rw-r--r-- | core/java/android/print/IPrintDocumentAdapter.aidl | 1 | ||||
| -rw-r--r-- | core/java/android/print/PrintManager.java | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/java/android/print/IPrintDocumentAdapter.aidl b/core/java/android/print/IPrintDocumentAdapter.aidl index 9d384fb..2b95c12 100644 --- a/core/java/android/print/IPrintDocumentAdapter.aidl +++ b/core/java/android/print/IPrintDocumentAdapter.aidl @@ -37,4 +37,5 @@ oneway interface IPrintDocumentAdapter { void write(in PageRange[] pages, in ParcelFileDescriptor fd, IWriteResultCallback callback, int sequence); void finish(); + void cancel(); } diff --git a/core/java/android/print/PrintManager.java b/core/java/android/print/PrintManager.java index bbfc307..d6d56bb 100644 --- a/core/java/android/print/PrintManager.java +++ b/core/java/android/print/PrintManager.java @@ -616,6 +616,18 @@ public final class PrintManager { } @Override + public void cancel() { + // Start not called or finish called or destroyed - nothing to do. + if (!mStartReqeusted || mFinishRequested || mDestroyed) { + return; + } + // Request cancellation of pending work if needed. + synchronized (mLock) { + cancelPreviousCancellableOperationLocked(); + } + } + + @Override public void onActivityPaused(Activity activity) { /* do nothing */ } |