Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d7888d1 authored by Svetoslav Ganov's avatar Svetoslav Ganov
Browse files

Printed document size not persisted. 

We persist ongoing print jobs so they can be restarted if the device
dies. The data size of the printed document was not persisted to disc.

bug:11199352

Change-Id: I53ef1ee285aa4808917dd6a5c7335226aba1ef0a
parent 9b6d3a15

core/java/android/print/PrintDocumentInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ public final class PrintDocumentInfo implements Parcelable { 
        builder.append("name=").append(mName);

        builder.append(", pageCount=").append(mPageCount);

        builder.append(", contentType=").append(contentTyepToString(mContentType));

        builder.append(", size=").append(mDataSize);

        builder.append(", dataSize=").append(mDataSize);

        builder.append("}");

        return builder.toString();

    }

packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java

+6 −0
Original line number Diff line number Diff line
@@ -730,6 +730,7 @@ public final class PrintSpoolerService extends Service { 
        private static final String ATTR_NAME = "name";

        private static final String ATTR_PAGE_COUNT = "pageCount";

        private static final String ATTR_CONTENT_TYPE = "contentType";

        private static final String ATTR_DATA_SIZE = "dataSize";



        private final AtomicFile mStatePersistFile;
@@ -893,6 +894,8 @@ public final class PrintSpoolerService extends Service { 
                                documentInfo.getContentType()));

                        serializer.attribute(null, ATTR_PAGE_COUNT, String.valueOf(

                                documentInfo.getPageCount()));

                        serializer.attribute(null, ATTR_DATA_SIZE, String.valueOf(

                                documentInfo.getDataSize()));

                        serializer.endTag(null, TAG_DOCUMENT_INFO);

                    }
@@ -1111,10 +1114,13 @@ public final class PrintSpoolerService extends Service { 
                        ATTR_PAGE_COUNT));

                final int contentType = Integer.parseInt(parser.getAttributeValue(null,

                        ATTR_CONTENT_TYPE));

                final int dataSize = Integer.parseInt(parser.getAttributeValue(null,

                        ATTR_DATA_SIZE));

                PrintDocumentInfo info = new PrintDocumentInfo.Builder(name)

                        .setPageCount(pageCount)

                        .setContentType(contentType).build();

                printJob.setDocumentInfo(info);

                info.setDataSize(dataSize);

                parser.next();

                skipEmptyTextTags(parser);

                expect(parser, XmlPullParser.END_TAG, TAG_DOCUMENT_INFO);