Updated Gallery to avoid breaking the build - API change (f9ac038e) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/gallery3d/util/PrintJob.java

+13 −3

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@ import android.graphics.RectF;
	import android.net.Uri;		import android.net.Uri;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.CancellationSignal;		import android.os.CancellationSignal;
			import android.os.ParcelFileDescriptor;
	import android.print.PageRange;		import android.print.PageRange;
	import android.print.PrintAttributes;		import android.print.PrintAttributes;
	import android.print.PrintDocumentAdapter;		import android.print.PrintDocumentAdapter;
	@@ -33,8 +34,8 @@ import android.print.pdf.PrintedPdfDocument;

	import com.android.gallery3d.filtershow.cache.ImageLoader;		import com.android.gallery3d.filtershow.cache.ImageLoader;

	import java.io.FileDescriptor;
	import java.io.FileOutputStream;		import java.io.FileOutputStream;
			import java.io.IOException;

	public class PrintJob {		public class PrintJob {
	private final static int MAX_PRINT_SIZE = 2048;		private final static int MAX_PRINT_SIZE = 2048;
	@@ -61,6 +62,7 @@ public class PrintJob {
	PrintDocumentInfo info = new PrintDocumentInfo		PrintDocumentInfo info = new PrintDocumentInfo
	.Builder(jobName, newPrintAttributes)		.Builder(jobName, newPrintAttributes)
	.setContentType(PrintDocumentInfo.CONTENT_TYPE_PHOTO)		.setContentType(PrintDocumentInfo.CONTENT_TYPE_PHOTO)
			.setColorMode(PrintAttributes.COLOR_MODE_COLOR)
	.setPageCount(1)		.setPageCount(1)
	.create();		.create();

	@@ -68,7 +70,7 @@ public class PrintJob {
	}		}

	@Override		@Override
	public void onWrite(PageRange[] pageRanges, FileDescriptor fileDescriptor,		public void onWrite(PageRange[] pageRanges, ParcelFileDescriptor fileDescriptor,
	CancellationSignal cancellationSignal,		CancellationSignal cancellationSignal,
	WriteResultCallback writeResultCallback) {		WriteResultCallback writeResultCallback) {
	try {		try {
	@@ -140,13 +142,21 @@ public class PrintJob {

	// Write the document.		// Write the document.
	pdfDocument.finishPage(page);		pdfDocument.finishPage(page);
	pdfDocument.writeTo(new FileOutputStream(fileDescriptor));		pdfDocument.writeTo(new FileOutputStream(
			fileDescriptor.getFileDescriptor()));
	pdfDocument.close();		pdfDocument.close();

	// Done.		// Done.
	writeResultCallback.onWriteFinished(		writeResultCallback.onWriteFinished(
	new PageRange[] { PageRange.ALL_PAGES });		new PageRange[] { PageRange.ALL_PAGES });
	} finally {		} finally {
			if (fileDescriptor != null) {
			try {
			fileDescriptor.close();
			} catch (IOException ioe) {
			/* ignore */
			}
			}
	writeResultCallback.onWriteFailed(null);		writeResultCallback.onWriteFailed(null);
	}		}
	}		}