Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d2b27cbd: am 6874bfe1: Merge "Created print jobs should not be persisted until they are queued." into klp-dev

Browse Source 
* commit 'd2b27cbde92dc57b5b6fe9b7434a5189a73dd2b2':
  Created print jobs should not be persisted until they are queued.
This commit is contained in:
Svetoslav
2013-11-14 22:30:52 -08:00
committed by Android Git Automerger
parent bb8e75e6c4 d2b27cbde9
commit 172c5a2473
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/PrintSpooler/res/layout/print_job_config_activity_content_error.xml
View File

@@ -35,7 +35,6 @@
android:layout_marginBottom="32dip" android:layout_marginBottom="32dip"
android:layout_gravity="center" android:layout_gravity="center"
style="?android:attr/buttonBarButtonStyle" style="?android:attr/buttonBarButtonStyle"
android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:text="@string/print_error_default_message" android:text="@string/print_error_default_message"
android:textColor="@color/important_text" android:textColor="@color/important_text"

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

@@ -441,6 +441,7 @@ public final class PrintSpoolerService extends Service {
private void removeObsoletePrintJobs() { private void removeObsoletePrintJobs() {
synchronized (mLock) { synchronized (mLock) {
boolean persistState = false;
final int printJobCount = mPrintJobs.size(); final int printJobCount = mPrintJobs.size();
for (int i = printJobCount - 1; i >= 0; i--) { for (int i = printJobCount - 1; i >= 0; i--) {
PrintJobInfo printJob = mPrintJobs.get(i); PrintJobInfo printJob = mPrintJobs.get(i);
@@ -450,9 +451,12 @@ public final class PrintSpoolerService extends Service {
Slog.i(LOG_TAG, "[REMOVE] " + printJob.getId().flattenToString()); Slog.i(LOG_TAG, "[REMOVE] " + printJob.getId().flattenToString());
} }
removePrintJobFileLocked(printJob.getId()); removePrintJobFileLocked(printJob.getId());
persistState = true;
} }
} }
mPersistanceManager.writeStateLocked(); if (persistState) {
mPersistanceManager.writeStateLocked();
}
} }
} }
@@ -799,6 +803,10 @@ public final class PrintSpoolerService extends Service {
for (int j = 0; j < printJobCount; j++) { for (int j = 0; j < printJobCount; j++) {
PrintJobInfo printJob = printJobs.get(j); PrintJobInfo printJob = printJobs.get(j);
if (!shouldPersistPrintJob(printJob)) {
continue;
}
serializer.startTag(null, TAG_JOB); serializer.startTag(null, TAG_JOB);
serializer.attribute(null, ATTR_ID, printJob.getId().flattenToString()); serializer.attribute(null, ATTR_ID, printJob.getId().flattenToString());