drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bececbfa: Merge "Printed document size not persisted." into klp-dev

Browse Source 
* commit 'bececbfae675055aa60ea21c5b8bd3dbb8acdbac':
  Printed document size not persisted.
This commit is contained in:
Svetoslav Ganov
2013-10-12 17:34:47 -07:00
committed by Android Git Automerger
parent bfc8edcf55 bececbfae6
commit 79ddf83522
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/print/PrintDocumentInfo.java
View File

@ -193,7 +193,7 @@ public final class PrintDocumentInfo implements Parcelable {
builder.append("name=").append(mName); builder.append("name=").append(mName);
builder.append(", pageCount=").append(mPageCount); builder.append(", pageCount=").append(mPageCount);
builder.append(", contentType=").append(contentTyepToString(mContentType)); builder.append(", contentType=").append(contentTyepToString(mContentType));
builder.append(", size=").append(mDataSize); builder.append(", dataSize=").append(mDataSize);
builder.append("}"); builder.append("}");
return builder.toString(); return builder.toString();
} }

6
packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java
View File

@ -730,6 +730,7 @@ public final class PrintSpoolerService extends Service {
private static final String ATTR_NAME = "name"; private static final String ATTR_NAME = "name";
private static final String ATTR_PAGE_COUNT = "pageCount"; private static final String ATTR_PAGE_COUNT = "pageCount";
private static final String ATTR_CONTENT_TYPE = "contentType"; private static final String ATTR_CONTENT_TYPE = "contentType";
private static final String ATTR_DATA_SIZE = "dataSize";
private final AtomicFile mStatePersistFile; private final AtomicFile mStatePersistFile;
@ -893,6 +894,8 @@ public final class PrintSpoolerService extends Service {
documentInfo.getContentType())); documentInfo.getContentType()));
serializer.attribute(null, ATTR_PAGE_COUNT, String.valueOf( serializer.attribute(null, ATTR_PAGE_COUNT, String.valueOf(
documentInfo.getPageCount())); documentInfo.getPageCount()));
serializer.attribute(null, ATTR_DATA_SIZE, String.valueOf(
documentInfo.getDataSize()));
serializer.endTag(null, TAG_DOCUMENT_INFO); serializer.endTag(null, TAG_DOCUMENT_INFO);
} }
@ -1111,10 +1114,13 @@ public final class PrintSpoolerService extends Service {
ATTR_PAGE_COUNT)); ATTR_PAGE_COUNT));
final int contentType = Integer.parseInt(parser.getAttributeValue(null, final int contentType = Integer.parseInt(parser.getAttributeValue(null,
ATTR_CONTENT_TYPE)); ATTR_CONTENT_TYPE));
final int dataSize = Integer.parseInt(parser.getAttributeValue(null,
ATTR_DATA_SIZE));
PrintDocumentInfo info = new PrintDocumentInfo.Builder(name) PrintDocumentInfo info = new PrintDocumentInfo.Builder(name)
.setPageCount(pageCount) .setPageCount(pageCount)
.setContentType(contentType).build(); .setContentType(contentType).build();
printJob.setDocumentInfo(info); printJob.setDocumentInfo(info);
info.setDataSize(dataSize);
parser.next(); parser.next();
skipEmptyTextTags(parser); skipEmptyTextTags(parser);
expect(parser, XmlPullParser.END_TAG, TAG_DOCUMENT_INFO); expect(parser, XmlPullParser.END_TAG, TAG_DOCUMENT_INFO);