am 86d2db97: Merge "Print spooler security and some new print service facing APIs." into klp-dev (97c61ab7) · Commits · e / os / android_frameworks_base

api/current.txt

+14 −7

core/java/android/print/IPrintManager.aidl

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -41,7 +41,9 @@ interface IPrintManager {
	void startPrinterDiscovery(in IPrinterDiscoveryObserver observer,		void startPrinterDiscovery(in IPrinterDiscoveryObserver observer,
	in List<PrinterId> priorityList, int userId);		in List<PrinterId> priorityList, int userId);
	void stopPrinterDiscovery(in IPrinterDiscoveryObserver observer, int userId);		void stopPrinterDiscovery(in IPrinterDiscoveryObserver observer, int userId);
	void requestPrinterUpdate(in PrinterId printerId, int userId);		void validatePrinters(in List<PrinterId> printerIds, int userId);
			void startPrinterStateTracking(in PrinterId printerId, int userId);
			void stopPrinterStateTracking(in PrinterId printerId, int userId);
	void destroyPrinterDiscoverySession(in IPrinterDiscoveryObserver observer,		void destroyPrinterDiscoverySession(in IPrinterDiscoveryObserver observer,
	int userId);		int userId);
	}		}

core/java/android/print/PrintDocumentAdapter.java

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -18,8 +18,8 @@ package android.print;

	import android.os.Bundle;		import android.os.Bundle;
	import android.os.CancellationSignal;		import android.os.CancellationSignal;
			import android.os.ParcelFileDescriptor;

	import java.io.FileDescriptor;
	import java.util.List;		import java.util.List;

	/**		/**
	@@ -41,7 +41,7 @@ import java.util.List;
	* <li>		* <li>
	* After every call to {@link #onLayout(PrintAttributes, PrintAttributes,		* After every call to {@link #onLayout(PrintAttributes, PrintAttributes,
	* CancellationSignal, LayoutResultCallback, Bundle)}, you may get a call to		* CancellationSignal, LayoutResultCallback, Bundle)}, you may get a call to
	* {@link #onWrite(PageRange[], FileDescriptor, CancellationSignal, WriteResultCallback)}		* {@link #onWrite(PageRange[], ParcelFileDescriptor, CancellationSignal, WriteResultCallback)}
	* asking you to write a PDF file with the content for specific pages.		* asking you to write a PDF file with the content for specific pages.
	* </li>		* </li>
	* <li>		* <li>
	@@ -64,7 +64,7 @@ import java.util.List;
	* PrintAttributes, CancellationSignal, LayoutResultCallback, Bundle)} on		* PrintAttributes, CancellationSignal, LayoutResultCallback, Bundle)} on
	* the UI thread (assuming onStart initializes resources needed for layout).		* the UI thread (assuming onStart initializes resources needed for layout).
	* This will ensure that the UI does not change while you are laying out the		* This will ensure that the UI does not change while you are laying out the
	* printed content. Then you can handle {@link #onWrite(PageRange[], FileDescriptor,		* printed content. Then you can handle {@link #onWrite(PageRange[], ParcelFileDescriptor,
	* CancellationSignal, WriteResultCallback)} and {@link #onFinish()} on another		* CancellationSignal, WriteResultCallback)} and {@link #onFinish()} on another
	* thread. This will ensure that the UI is frozen for the minimal amount of		* thread. This will ensure that the UI is frozen for the minimal amount of
	* time. Also this assumes that you will generate the printed content in		* time. Also this assumes that you will generate the printed content in
	@@ -150,10 +150,10 @@ public abstract class PrintDocumentAdapter {
	* from of a PDF file to the given file descriptor. This method is invoked		* from of a PDF file to the given file descriptor. This method is invoked
	* on the main thread.		* on the main thread.
	*<p>		*<p>
	* After you are done writing, you should <strong>not</strong> close the		* After you are done writing, you should close the file descriptor and
	* file descriptor, rather you must invoke: {@link WriteResultCallback		* invoke {@link WriteResultCallback #onWriteFinished(List)}, if writing
	* #onWriteFinished(List)}, if writing completed successfully; or {@link		* completed successfully; or {@link WriteResultCallback#onWriteFailed(
	* WriteResultCallback#onWriteFailed(CharSequence)}, if an error occurred.		* CharSequence)}, if an error occurred.
	* </p>		* </p>
	* <p>		* <p>
	* <strong>Note:</strong> If the printed content is large, it is a good		* <strong>Note:</strong> If the printed content is large, it is a good
	@@ -171,7 +171,7 @@ public abstract class PrintDocumentAdapter {
	* @see WriteResultCallback		* @see WriteResultCallback
	* @see CancellationSignal		* @see CancellationSignal
	*/		*/
	public abstract void onWrite(PageRange[] pages, FileDescriptor destination,		public abstract void onWrite(PageRange[] pages, ParcelFileDescriptor destination,
	CancellationSignal cancellationSignal, WriteResultCallback callback);		CancellationSignal cancellationSignal, WriteResultCallback callback);

	/**		/**
	@@ -185,7 +185,7 @@ public abstract class PrintDocumentAdapter {

	/**		/**
	* Base class for implementing a callback for the result of {@link		* Base class for implementing a callback for the result of {@link
	* PrintDocumentAdapter#onWrite(PageRange[], FileDescriptor, CancellationSignal,		* PrintDocumentAdapter#onWrite(PageRange[], ParcelFileDescriptor, CancellationSignal,
	* WriteResultCallback)}.		* WriteResultCallback)}.
	*/		*/
	public static abstract class WriteResultCallback {		public static abstract class WriteResultCallback {

core/java/android/print/PrintDocumentInfo.java

+30 −0

Original line number	Original line	Diff line number	Diff line
	@@ -60,6 +60,7 @@ public final class PrintDocumentInfo implements Parcelable {
	private int mColorMode;		private int mColorMode;
	private Margins mMargins;		private Margins mMargins;
	private MediaSize mMediaSize;		private MediaSize mMediaSize;
			private long mDataSize;

	/**		/**
	* Creates a new instance.		* Creates a new instance.
	@@ -82,6 +83,7 @@ public final class PrintDocumentInfo implements Parcelable {
	mColorMode = prototype.mColorMode;		mColorMode = prototype.mColorMode;
	mMargins = prototype.mMargins;		mMargins = prototype.mMargins;
	mMediaSize = prototype.mMediaSize;		mMediaSize = prototype.mMediaSize;
			mDataSize = prototype.mDataSize;
	}		}

	/**		/**
	@@ -98,6 +100,7 @@ public final class PrintDocumentInfo implements Parcelable {
	mColorMode = parcel.readInt();		mColorMode = parcel.readInt();
	mMargins = Margins.createFromParcel(parcel);		mMargins = Margins.createFromParcel(parcel);
	mMediaSize = MediaSize.createFromParcel(parcel);		mMediaSize = MediaSize.createFromParcel(parcel);
			mDataSize = parcel.readLong();
	}		}

	/**		/**
	@@ -188,6 +191,26 @@ public final class PrintDocumentInfo implements Parcelable {
	return mMediaSize;		return mMediaSize;
	}		}

			/**
			* Gets the document data size in bytes.
			*
			* @return The data size.
			*/
			public long getDataSize() {
			return mDataSize;
			}

			/**
			* Sets the document data size in bytes.
			*
			* @param dataSize The data size.
			*
			* @hide
			*/
			public void setDataSize(long dataSize) {
			mDataSize = dataSize;
			}

	@Override		@Override
	public int describeContents() {		public int describeContents() {
	return 0;		return 0;
	@@ -203,6 +226,7 @@ public final class PrintDocumentInfo implements Parcelable {
	parcel.writeInt(mColorMode);		parcel.writeInt(mColorMode);
	mMargins.writeToParcel(parcel);		mMargins.writeToParcel(parcel);
	mMediaSize.writeToParcel(parcel);		mMediaSize.writeToParcel(parcel);
			parcel.writeLong(mDataSize);
	}		}

	@Override		@Override
	@@ -217,6 +241,8 @@ public final class PrintDocumentInfo implements Parcelable {
	result = prime * result + mColorMode;		result = prime * result + mColorMode;
	result = prime * result + (mMargins != null ? mMargins.hashCode() : 0);		result = prime * result + (mMargins != null ? mMargins.hashCode() : 0);
	result = prime * result + (mMediaSize != null ? mMediaSize.hashCode() : 0);		result = prime * result + (mMediaSize != null ? mMediaSize.hashCode() : 0);
			result = prime * result + (int) mDataSize;
			result = prime * result + (int) mDataSize >> 32;
	return result;		return result;
	}		}

	@@ -264,6 +290,9 @@ public final class PrintDocumentInfo implements Parcelable {
	} else if (!mMediaSize.equals(other.mMediaSize)) {		} else if (!mMediaSize.equals(other.mMediaSize)) {
	return false;		return false;
	}		}
			if (mDataSize != other.mDataSize) {
			return false;
			}
	return true;		return true;
	}		}

	@@ -279,6 +308,7 @@ public final class PrintDocumentInfo implements Parcelable {
	builder.append(", colorMode=").append(PrintAttributes.colorModeToString(mColorMode));		builder.append(", colorMode=").append(PrintAttributes.colorModeToString(mColorMode));
	builder.append(", margins=").append(mMargins);		builder.append(", margins=").append(mMargins);
	builder.append(", mediaSize=").append(mMediaSize);		builder.append(", mediaSize=").append(mMediaSize);
			builder.append(", size=").append(mDataSize);
	builder.append("}");		builder.append("}");
	return builder.toString();		return builder.toString();
	}		}

core/java/android/print/PrintFileDocumentAdapter.java

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ import android.os.AsyncTask;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.CancellationSignal;		import android.os.CancellationSignal;
	import android.os.CancellationSignal.OnCancelListener;		import android.os.CancellationSignal.OnCancelListener;
			import android.os.ParcelFileDescriptor;
	import android.util.Log;		import android.util.Log;

	import com.android.internal.R;		import com.android.internal.R;
	@@ -28,7 +29,6 @@ import com.android.internal.R;
	import libcore.io.IoUtils;		import libcore.io.IoUtils;

	import java.io.File;		import java.io.File;
	import java.io.FileDescriptor;
	import java.io.FileInputStream;		import java.io.FileInputStream;
	import java.io.FileOutputStream;		import java.io.FileOutputStream;
	import java.io.IOException;		import java.io.IOException;
	@@ -81,7 +81,7 @@ public class PrintFileDocumentAdapter extends PrintDocumentAdapter {
	}		}

	@Override		@Override
	public void onWrite(PageRange[] pages, FileDescriptor destination,		public void onWrite(PageRange[] pages, ParcelFileDescriptor destination,
	CancellationSignal cancellationSignal, WriteResultCallback callback) {		CancellationSignal cancellationSignal, WriteResultCallback callback) {
	mWriteFileAsyncTask = new WriteFileAsyncTask(destination, cancellationSignal, callback);		mWriteFileAsyncTask = new WriteFileAsyncTask(destination, cancellationSignal, callback);
	mWriteFileAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,		mWriteFileAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
	@@ -90,13 +90,13 @@ public class PrintFileDocumentAdapter extends PrintDocumentAdapter {

	private final class WriteFileAsyncTask extends AsyncTask<Void, Void, Void> {		private final class WriteFileAsyncTask extends AsyncTask<Void, Void, Void> {

	private final FileDescriptor mDestination;		private final ParcelFileDescriptor mDestination;

	private final WriteResultCallback mResultCallback;		private final WriteResultCallback mResultCallback;

	private final CancellationSignal mCancellationSignal;		private final CancellationSignal mCancellationSignal;

	public WriteFileAsyncTask(FileDescriptor destination,		public WriteFileAsyncTask(ParcelFileDescriptor destination,
	CancellationSignal cancellationSignal, WriteResultCallback callback) {		CancellationSignal cancellationSignal, WriteResultCallback callback) {
	mDestination = destination;		mDestination = destination;
	mResultCallback = callback;		mResultCallback = callback;
	@@ -112,7 +112,7 @@ public class PrintFileDocumentAdapter extends PrintDocumentAdapter {
	@Override		@Override
	protected Void doInBackground(Void... params) {		protected Void doInBackground(Void... params) {
	InputStream in = null;		InputStream in = null;
	OutputStream out = new FileOutputStream(mDestination);		OutputStream out = new FileOutputStream(mDestination.getFileDescriptor());
	final byte[] buffer = new byte[8192];		final byte[] buffer = new byte[8192];
	try {		try {
	in = new FileInputStream(mFile);		in = new FileInputStream(mFile);