diff options
author | Svetoslav <svetoslavganov@google.com> | 2013-10-14 22:48:20 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-14 22:48:20 +0000 |
commit | c89e5a6af1514320f90329dadebdfa26a3ae93d2 (patch) | |
tree | 2cc7617133f5ad87aeb828bd31e097efda2e12d0 /packages/PrintSpooler/src/com/android/printspooler | |
parent | 79a0ed5848379b1f587bcc55a8a8b9417df6303b (diff) | |
parent | 9d843e09caa8c32a3fec22bb66cba8e6d4dfa5b1 (diff) | |
download | frameworks_base-c89e5a6af1514320f90329dadebdfa26a3ae93d2.zip frameworks_base-c89e5a6af1514320f90329dadebdfa26a3ae93d2.tar.gz frameworks_base-c89e5a6af1514320f90329dadebdfa26a3ae93d2.tar.bz2 |
Merge "Layout may be called with invalid print attributes." into klp-dev
Diffstat (limited to 'packages/PrintSpooler/src/com/android/printspooler')
-rw-r--r-- | packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java b/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java index 22a9950..3a23b3e 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java +++ b/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java @@ -1248,13 +1248,20 @@ public class PrintJobConfigActivity extends Activity { continue; } + // If nothing changed - done. + if (mCurrentPrinter.equals(printer)) { + return; + } + // If the current printer became available and has no // capabilities, we refresh it. if (mCurrentPrinter.getStatus() == PrinterInfo.STATUS_UNAVAILABLE && printer.getStatus() != PrinterInfo.STATUS_UNAVAILABLE - && printer.getCapabilities() == null - && !mCapabilitiesTimeout.isPosted()) { - mCapabilitiesTimeout.post(); + && printer.getCapabilities() == null) { + if (!mCapabilitiesTimeout.isPosted()) { + mCapabilitiesTimeout.post(); + } + mCurrentPrinter.copyFrom(printer); refreshCurrentPrinter(); return; } @@ -1268,10 +1275,10 @@ public class PrintJobConfigActivity extends Activity { && printer.getCapabilities() == null)) { if (!mCapabilitiesTimeout.isPosted()) { mCapabilitiesTimeout.post(); - mCurrentPrinter.copyFrom(printer); - updateUi(); - return; } + mCurrentPrinter.copyFrom(printer); + updateUi(); + return; } // We just refreshed the current printer. |