Merge "Revert "ssss"" (4d79d782) · Commits · e / os / android_frameworks_base

core/java/android/print/IPrintManager.aidl

+0 −1

Original line number	Diff line number	Diff line
		@@ -33,5 +33,4 @@ interface IPrintManager {
		in IPrintDocumentAdapter printAdapter, in PrintAttributes attributes,
		int appId, int userId);
		void cancelPrintJob(int printJobId, int appId, int userId);
		void restartPrintJob(int printJobId, int appId, int userId);
		}

core/java/android/print/IPrintSpooler.aidl

+4 −2

Original line number	Diff line number	Diff line
		@@ -40,8 +40,10 @@ oneway interface IPrintSpooler {
		void createPrintJob(String printJobName, in IPrintClient client,
		in IPrintDocumentAdapter printAdapter, in PrintAttributes attributes,
		IPrintSpoolerCallbacks callback, int appId, int sequence);
		void setPrintJobState(int printJobId, int status, CharSequence error,
		IPrintSpoolerCallbacks callback, int sequence);
		void cancelPrintJob(int printJobId, IPrintSpoolerCallbacks callback,
		int appId, int sequence);
		void setPrintJobState(int printJobId, int status, IPrintSpoolerCallbacks callback,
		int sequence);
		void setPrintJobTag(int printJobId, String tag, IPrintSpoolerCallbacks callback,
		int sequence);
		void writePrintJobData(in ParcelFileDescriptor fd, int printJobId);

core/java/android/print/PrintJobInfo.java

+0 −35

Original line number	Diff line number	Diff line
		@@ -124,9 +124,6 @@ public final class PrintJobInfo implements Parcelable {
		/** How many copies to print. */
		private int mCopies;

		/** Failure reason if this job failed. */
		private CharSequence mFailureReason;

		/** The pages to print */
		private PageRange[] mPageRanges;

		@@ -151,7 +148,6 @@ public final class PrintJobInfo implements Parcelable {
		mUserId = other.mUserId;
		mTag = other.mTag;
		mCopies = other.mCopies;
		mFailureReason = other.mFailureReason;
		mPageRanges = other.mPageRanges;
		mAttributes = other.mAttributes;
		mDocumentInfo = other.mDocumentInfo;
		@@ -166,9 +162,6 @@ public final class PrintJobInfo implements Parcelable {
		mUserId = parcel.readInt();
		mTag = parcel.readString();
		mCopies = parcel.readInt();
		if (parcel.readInt() == 1) {
		mFailureReason = parcel.readCharSequence();
		}
		if (parcel.readInt() == 1) {
		Parcelable[] parcelables = parcel.readParcelableArray(null);
		mPageRanges = new PageRange[parcelables.length];
		@@ -351,28 +344,6 @@ public final class PrintJobInfo implements Parcelable {
		mCopies = copyCount;
		}

		/**
		* The failure reason if this print job failed.
		*
		* @return The failure reason.
		*
		* @hide
		*/
		public CharSequence getFailureReason() {
		return mFailureReason;
		}

		/**
		* The failure reason if this print job failed.
		*
		* @param failureReason The failure reason.
		*
		* @hide
		*/
		public void setFailureReason(CharSequence failureReason) {
		mFailureReason = failureReason;
		}

		/**
		* Gets the included pages.
		*
		@@ -450,12 +421,6 @@ public final class PrintJobInfo implements Parcelable {
		parcel.writeInt(mUserId);
		parcel.writeString(mTag);
		parcel.writeInt(mCopies);
		if (mFailureReason != null) {
		parcel.writeInt(1);
		parcel.writeCharSequence(mFailureReason);
		} else {
		parcel.writeInt(0);
		}
		if (mPageRanges != null) {
		parcel.writeInt(1);
		parcel.writeParcelableArray(mPageRanges, flags);

core/java/android/print/PrinterId.java

+26 −26

Original line number	Diff line number	Diff line
		@@ -26,26 +26,26 @@ import android.text.TextUtils;
		*/
		public final class PrinterId implements Parcelable {

		private final ComponentName mServiceName;
		private final ComponentName mServiceComponentName;

		private final String mPrinterName;
		private final String mLocalId;

		/**
		* Creates a new instance.
		*
		* @param serviceName The managing print service.
		* @param printerName The unique id within the managing service.
		* @param serviceComponentName The managing print service.
		* @param localId The unique id within the managing service.
		*
		* @hide
		*/
		public PrinterId(ComponentName serviceName, String printerName) {
		mServiceName = serviceName;
		mPrinterName = printerName;
		public PrinterId(ComponentName serviceComponentName, String localId) {
		mServiceComponentName = serviceComponentName;
		mLocalId = localId;
		}

		private PrinterId(Parcel parcel) {
		mServiceName = parcel.readParcelable(null);
		mPrinterName = parcel.readString();
		mServiceComponentName = parcel.readParcelable(null);
		mLocalId = parcel.readString();
		}

		/**
		@@ -55,18 +55,18 @@ public final class PrinterId implements Parcelable {
		*
		* @hide
		*/
		public ComponentName getServiceName() {
		return mServiceName;
		public ComponentName getService() {
		return mServiceComponentName;
		}

		/**
		* Gets the name of this printer which is unique in the context
		* Gets the local id of this printer in the context
		* of the print service that manages it.
		*
		* @return The printer name.
		* @return The local id.
		*/
		public String getPrinterName() {
		return mPrinterName;
		public String getLocalId() {
		return mLocalId;
		}

		@Override
		@@ -76,8 +76,8 @@ public final class PrinterId implements Parcelable {

		@Override
		public void writeToParcel(Parcel parcel, int flags) {
		parcel.writeParcelable(mServiceName, flags);
		parcel.writeString(mPrinterName);
		parcel.writeParcelable(mServiceComponentName, flags);
		parcel.writeString(mLocalId);
		}

		@Override
		@@ -92,14 +92,14 @@ public final class PrinterId implements Parcelable {
		return false;
		}
		PrinterId other = (PrinterId) object;
		if (mServiceName == null) {
		if (other.mServiceName != null) {
		if (mServiceComponentName == null) {
		if (other.mServiceComponentName != null) {
		return false;
		}
		} else if (!mServiceName.equals(other.mServiceName)) {
		} else if (!mServiceComponentName.equals(other.mServiceComponentName)) {
		return false;
		}
		if (!TextUtils.equals(mPrinterName, other.mPrinterName)) {
		if (!TextUtils.equals(mLocalId, other.mLocalId)) {
		return false;
		}
		return true;
		@@ -109,9 +109,9 @@ public final class PrinterId implements Parcelable {
		public int hashCode() {
		final int prime = 31;
		int hashCode = 1;
		hashCode = prime * hashCode + ((mServiceName != null)
		? mServiceName.hashCode() : 1);
		hashCode = prime * hashCode + mPrinterName.hashCode();
		hashCode = prime * hashCode + ((mServiceComponentName != null)
		? mServiceComponentName.hashCode() : 1);
		hashCode = prime * hashCode + mLocalId.hashCode();
		return hashCode;
		}

		@@ -119,9 +119,9 @@ public final class PrinterId implements Parcelable {
		public String toString() {
		StringBuilder builder = new StringBuilder();
		builder.append("PrinterId{");
		builder.append(mServiceName.flattenToString());
		builder.append(mServiceComponentName.flattenToString());
		builder.append(":");
		builder.append(mPrinterName);
		builder.append(mLocalId);
		builder.append('}');
		return builder.toString();
		}

core/java/android/print/PrinterInfo.java

+26 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.print.PrintAttributes.Margins;
		import android.print.PrintAttributes.MediaSize;
		import android.print.PrintAttributes.Resolution;
		import android.print.PrintAttributes.Tray;
		import android.text.TextUtils;

		import java.util.ArrayList;
		import java.util.Arrays;
		@@ -58,6 +59,7 @@ public final class PrinterInfo implements Parcelable {
		// TODO: Add printer status constants.

		private PrinterId mId;
		private CharSequence mLabel;
		private int mStatus;

		private Margins mMinMargins = DEFAULT_MARGINS;
		@@ -90,6 +92,7 @@ public final class PrinterInfo implements Parcelable {
		*/
		public void copyFrom(PrinterInfo other) {
		mId = other.mId;
		mLabel = other.mLabel;
		mStatus = other.mStatus;

		mMinMargins = other.mMinMargins;
		@@ -158,6 +161,15 @@ public final class PrinterInfo implements Parcelable {
		return mId;
		}

		/**
		* Gets the human readable printer label.
		*
		* @return The human readable label.
		*/
		public CharSequence getLabel() {
		return mLabel;
		}

		/**
		* Gets the status of the printer.
		*
		@@ -331,6 +343,7 @@ public final class PrinterInfo implements Parcelable {

		private PrinterInfo(Parcel parcel) {
		mId = parcel.readParcelable(null);
		mLabel = parcel.readCharSequence();
		mStatus = parcel.readInt();

		mMinMargins = readMargins(parcel);
		@@ -356,6 +369,7 @@ public final class PrinterInfo implements Parcelable {
		@Override
		public void writeToParcel(Parcel parcel, int flags) {
		parcel.writeParcelable(mId, flags);
		parcel.writeCharSequence(mLabel);
		parcel.writeInt(mStatus);

		writeMargins(mMinMargins, parcel);
		@@ -378,6 +392,7 @@ public final class PrinterInfo implements Parcelable {
		final int prime = 31;
		int result = 1;
		result = prime * result + ((mId == null) ? 0 : mId.hashCode());
		result = prime * result + ((mLabel == null) ? 0 : mLabel.hashCode());
		result = prime * result + mStatus;
		result = prime * result + ((mMinMargins == null) ? 0 : mMinMargins.hashCode());
		result = prime * result + ((mMediaSizes == null) ? 0 : mMediaSizes.hashCode());
		@@ -412,6 +427,9 @@ public final class PrinterInfo implements Parcelable {
		} else if (!mId.equals(other.mId)) {
		return false;
		}
		if (!TextUtils.equals(mLabel, other.mLabel)) {
		return false;
		}
		if (mStatus != other.mStatus) {
		return false;
		}
		@@ -480,6 +498,7 @@ public final class PrinterInfo implements Parcelable {
		StringBuilder builder = new StringBuilder();
		builder.append("PrinterInfo{");
		builder.append(mId).append(", \"");
		builder.append(mLabel);
		builder.append("\"}");
		return builder.toString();
		}
		@@ -620,14 +639,20 @@ public final class PrinterInfo implements Parcelable {
		* Creates a new instance.
		*
		* @param printerId The printer id. Cannot be null.
		* @param label The human readable printer label. Cannot be null or empty.
		*
		* @throws IllegalArgumentException If the printer id is null.
		* @throws IllegalArgumentException If the label is empty.
		*/
		public Builder(PrinterId printerId) {
		public Builder(PrinterId printerId, CharSequence label) {
		if (printerId == null) {
		throw new IllegalArgumentException("printerId cannot be null.");
		}
		if (TextUtils.isEmpty(label)) {
		throw new IllegalArgumentException("label cannot be empty.");
		}
		mPrototype = new PrinterInfo();
		mPrototype.mLabel = label;
		mPrototype.mId = printerId;
		}