diff options
Diffstat (limited to 'packages/PrintSpooler/src/com/android/printspooler')
| -rw-r--r-- | packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java | 17 | ||||
| -rw-r--r-- | packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java | 4 |
2 files changed, 7 insertions, 14 deletions
diff --git a/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java b/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java index 3ba7369..a8c4f07 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java +++ b/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java @@ -89,8 +89,6 @@ import com.android.printspooler.MediaSizeUtils.MediaSizeComparator; import libcore.io.IoUtils; -import libcore.io.IoUtils; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -2189,9 +2187,10 @@ public class PrintJobConfigActivity extends Activity { @Override public int getCount() { - final int additionalItemCount = (mFakePdfPrinter != null) ? 2 : 1; - return Math.min(mPrinters.size() + additionalItemCount, - DEST_ADAPTER_MAX_ITEM_COUNT); + if (mFakePdfPrinter == null) { + return 0; + } + return Math.min(mPrinters.size() + 2, DEST_ADAPTER_MAX_ITEM_COUNT); } @Override @@ -2227,14 +2226,12 @@ public class PrintJobConfigActivity extends Activity { @Override public long getItemId(int position) { if (mPrinters.isEmpty()) { - if (position == 0) { - if (mFakePdfPrinter != null) { + if (mFakePdfPrinter != null) { + if (position == 0) { return DEST_ADAPTER_ITEM_ID_SAVE_AS_PDF; - } else { + } else if (position == 1) { return DEST_ADAPTER_ITEM_ID_ALL_PRINTERS; } - } else if (position == 1) { - return DEST_ADAPTER_ITEM_ID_ALL_PRINTERS; } } else { if (position == 1 && mFakePdfPrinter != null) { diff --git a/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java b/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java index 98d00a9..a4d557f 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java +++ b/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java @@ -689,7 +689,6 @@ public final class PrintSpoolerService extends Service { private static final String ATTR_PACKAGE_NAME = "packageName"; private static final String ATTR_STATE = "state"; private static final String ATTR_APP_ID = "appId"; - private static final String ATTR_USER_ID = "userId"; private static final String ATTR_TAG = "tag"; private static final String ATTR_CREATION_TIME = "creationTime"; private static final String ATTR_COPIES = "copies"; @@ -778,7 +777,6 @@ public final class PrintSpoolerService extends Service { serializer.attribute(null, ATTR_LABEL, printJob.getLabel().toString()); serializer.attribute(null, ATTR_STATE, String.valueOf(printJob.getState())); serializer.attribute(null, ATTR_APP_ID, String.valueOf(printJob.getAppId())); - serializer.attribute(null, ATTR_USER_ID, String.valueOf(printJob.getUserId())); String tag = printJob.getTag(); if (tag != null) { serializer.attribute(null, ATTR_TAG, tag); @@ -976,8 +974,6 @@ public final class PrintSpoolerService extends Service { printJob.setState(state); final int appId = Integer.parseInt(parser.getAttributeValue(null, ATTR_APP_ID)); printJob.setAppId(appId); - final int userId = Integer.parseInt(parser.getAttributeValue(null, ATTR_USER_ID)); - printJob.setUserId(userId); String tag = parser.getAttributeValue(null, ATTR_TAG); printJob.setTag(tag); String creationTime = parser.getAttributeValue(null, ATTR_CREATION_TIME); |