summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2013-10-04 23:48:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-04 23:48:37 +0000
commit19565ad1a19bf8e400d04a3a64cf6455ddca81ca (patch)
tree52d57c73d4597516b8eae21b9e0db84b81edb7c7 /api
parented887bff6e3ae0aee562022135e3d927a327bd2a (diff)
parentb450d0d4d7fca16674fea02f15e21dc737352c40 (diff)
downloadframeworks_base-19565ad1a19bf8e400d04a3a64cf6455ddca81ca.zip
frameworks_base-19565ad1a19bf8e400d04a3a64cf6455ddca81ca.tar.gz
frameworks_base-19565ad1a19bf8e400d04a3a64cf6455ddca81ca.tar.bz2
Merge "Small print API tweaks" into klp-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt9
1 files changed, 1 insertions, 8 deletions
diff --git a/api/current.txt b/api/current.txt
index 4967b52..1ad4377 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -19368,12 +19368,6 @@ package android.print {
method public android.print.PrintDocumentInfo.Builder setPageCount(int);
}
- public class PrintFileDocumentAdapter extends android.print.PrintDocumentAdapter {
- ctor public PrintFileDocumentAdapter(android.content.Context, java.io.File, android.print.PrintDocumentInfo);
- method public void onLayout(android.print.PrintAttributes, android.print.PrintAttributes, android.os.CancellationSignal, android.print.PrintDocumentAdapter.LayoutResultCallback, android.os.Bundle);
- method public void onWrite(android.print.PageRange[], android.os.ParcelFileDescriptor, android.os.CancellationSignal, android.print.PrintDocumentAdapter.WriteResultCallback);
- }
-
public final class PrintJob {
method public void cancel();
method public android.print.PrintJobId getId();
@@ -19403,10 +19397,8 @@ package android.print {
method public android.print.PageRange[] getPages();
method public android.print.PrinterId getPrinterId();
method public int getState();
- method public java.lang.String getTag();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator CREATOR;
- field public static final int PRINT_JOB_ID_UNDEFINED = -1; // 0xffffffff
field public static final int STATE_BLOCKED = 4; // 0x4
field public static final int STATE_CANCELED = 7; // 0x7
field public static final int STATE_COMPLETED = 5; // 0x5
@@ -19501,6 +19493,7 @@ package android.printservice {
method public android.printservice.PrintDocument getDocument();
method public android.print.PrintJobId getId();
method public android.print.PrintJobInfo getInfo();
+ method public java.lang.String getTag();
method public boolean isBlocked();
method public boolean isCancelled();
method public boolean isCompleted();