summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2013-10-04 23:48:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-04 23:48:37 +0000
commit19565ad1a19bf8e400d04a3a64cf6455ddca81ca (patch)
tree52d57c73d4597516b8eae21b9e0db84b81edb7c7 /services
parented887bff6e3ae0aee562022135e3d927a327bd2a (diff)
parentb450d0d4d7fca16674fea02f15e21dc737352c40 (diff)
downloadframeworks_base-19565ad1a19bf8e400d04a3a64cf6455ddca81ca.zip
frameworks_base-19565ad1a19bf8e400d04a3a64cf6455ddca81ca.tar.gz
frameworks_base-19565ad1a19bf8e400d04a3a64cf6455ddca81ca.tar.bz2
Merge "Small print API tweaks" into klp-dev
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/print/UserState.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/services/java/com/android/server/print/UserState.java b/services/java/com/android/server/print/UserState.java
index 3b0ee24..b3f0036 100644
--- a/services/java/com/android/server/print/UserState.java
+++ b/services/java/com/android/server/print/UserState.java
@@ -205,6 +205,10 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks {
for (int i = 0; i < cachedPrintJobCount; i++) {
PrintJobInfo cachedPrintJob = cachedPrintJobs.get(i);
result.put(cachedPrintJob.getId(), cachedPrintJob);
+ // Strip out the tag - it is visible only to print services.
+ // Also the cached print jobs are delivered only to apps, so
+ // stripping the tag of a cached print job is fine.
+ cachedPrintJob.setTag(null);
}
// Add everything else the spooler knows about.
@@ -215,6 +219,8 @@ final class UserState implements PrintSpoolerCallbacks, PrintServiceCallbacks {
for (int i = 0; i < printJobCount; i++) {
PrintJobInfo printJob = printJobs.get(i);
result.put(printJob.getId(), printJob);
+ // Strip out the tag - it is visible only to print services.
+ printJob.setTag(null);
}
}