diff options
author | Svetoslav <svetoslavganov@google.com> | 2013-11-14 22:27:35 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-14 22:27:35 -0800 |
commit | d2b27cbde92dc57b5b6fe9b7434a5189a73dd2b2 (patch) | |
tree | 45e7ded679e00f0810ee916a0816a02e1f9b714c /packages/PrintSpooler | |
parent | cce2e1944c4ac9411fa25534eb9b51d6f044dfb4 (diff) | |
parent | 6874bfe19b6bc1522e07e53eb96a07e21d148b41 (diff) | |
download | frameworks_base-d2b27cbde92dc57b5b6fe9b7434a5189a73dd2b2.zip frameworks_base-d2b27cbde92dc57b5b6fe9b7434a5189a73dd2b2.tar.gz frameworks_base-d2b27cbde92dc57b5b6fe9b7434a5189a73dd2b2.tar.bz2 |
am 6874bfe1: Merge "Created print jobs should not be persisted until they are queued." into klp-dev
* commit '6874bfe19b6bc1522e07e53eb96a07e21d148b41':
Created print jobs should not be persisted until they are queued.
Diffstat (limited to 'packages/PrintSpooler')
-rw-r--r-- | packages/PrintSpooler/res/layout/print_job_config_activity_content_error.xml | 1 | ||||
-rw-r--r-- | packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/packages/PrintSpooler/res/layout/print_job_config_activity_content_error.xml b/packages/PrintSpooler/res/layout/print_job_config_activity_content_error.xml index f573d9d..d9f0a9a 100644 --- a/packages/PrintSpooler/res/layout/print_job_config_activity_content_error.xml +++ b/packages/PrintSpooler/res/layout/print_job_config_activity_content_error.xml @@ -35,7 +35,6 @@ android:layout_marginBottom="32dip" android:layout_gravity="center" style="?android:attr/buttonBarButtonStyle" - android:singleLine="true" android:ellipsize="end" android:text="@string/print_error_default_message" android:textColor="@color/important_text" diff --git a/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java b/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java index 778fb4d..615d667 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java +++ b/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java @@ -441,6 +441,7 @@ public final class PrintSpoolerService extends Service { private void removeObsoletePrintJobs() { synchronized (mLock) { + boolean persistState = false; final int printJobCount = mPrintJobs.size(); for (int i = printJobCount - 1; i >= 0; i--) { PrintJobInfo printJob = mPrintJobs.get(i); @@ -450,9 +451,12 @@ public final class PrintSpoolerService extends Service { Slog.i(LOG_TAG, "[REMOVE] " + printJob.getId().flattenToString()); } 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++) { PrintJobInfo printJob = printJobs.get(j); + if (!shouldPersistPrintJob(printJob)) { + continue; + } + serializer.startTag(null, TAG_JOB); serializer.attribute(null, ATTR_ID, printJob.getId().flattenToString()); |