Merge "Deal correctly with suggested print attributes" (6dc9114e) · Commits · e / os / android_frameworks_base

core/java/android/print/PrintAttributes.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ public final class PrintAttributes implements Parcelable {
		private Margins mMinMargins;

		private int mColorMode;
		private int mDuplexMode = DUPLEX_MODE_NONE;
		private int mDuplexMode;

		PrintAttributes() {
		/* hide constructor */
		@@ -403,7 +403,7 @@ public final class PrintAttributes implements Parcelable {
		mResolution = null;
		mMinMargins = null;
		mColorMode = 0;
		mDuplexMode = DUPLEX_MODE_NONE;
		mDuplexMode = 0;
		}

		/**
		@@ -1427,10 +1427,6 @@ public final class PrintAttributes implements Parcelable {

		/**
		* Creates a new {@link PrintAttributes} instance.
		* <p>
		* If you do not specify a duplex mode, the default
		* {@link #DUPLEX_MODE_NONE} will be used.
		* </p>
		*
		* @return The new instance.
		*/

+3 −1

Original line number	Diff line number	Diff line
		@@ -240,7 +240,9 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
		throw new IllegalArgumentException(PrintManager.EXTRA_PRINT_JOB
		+ " cannot be null");
		}
		if (mPrintJob.getAttributes() == null) {
		mPrintJob.setAttributes(new PrintAttributes.Builder().build());
		}

		final IBinder adapter = extras.getBinder(PrintManager.EXTRA_PRINT_DOCUMENT_ADAPTER);
		if (adapter == null) {