summaryrefslogtreecommitdiffstats
path: root/packages/PrintSpooler
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2013-10-13 12:15:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-13 12:15:13 -0700
commitc7db28558d737d2d06fc2f0545f19350dc603666 (patch)
tree6fd85f7313a4d4d674f30324a911b95fe436a024 /packages/PrintSpooler
parentb0d1ee9033e72a457f19563c966cd28ed647aa83 (diff)
parent64ee79dd2d0b7a5bdff2590f252661d2fa5f76d7 (diff)
downloadframeworks_base-c7db28558d737d2d06fc2f0545f19350dc603666.zip
frameworks_base-c7db28558d737d2d06fc2f0545f19350dc603666.tar.gz
frameworks_base-c7db28558d737d2d06fc2f0545f19350dc603666.tar.bz2
am 64ee79dd: am 3cccec4c: Merge "The callbacks for tracking a printer called more than once without printer change." into klp-dev
* commit '64ee79dd2d0b7a5bdff2590f252661d2fa5f76d7': The callbacks for tracking a printer called more than once without printer change.
Diffstat (limited to 'packages/PrintSpooler')
-rw-r--r--packages/PrintSpooler/src/com/android/printspooler/FusedPrintersProvider.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/PrintSpooler/src/com/android/printspooler/FusedPrintersProvider.java b/packages/PrintSpooler/src/com/android/printspooler/FusedPrintersProvider.java
index 8aa290c..0601467 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/FusedPrintersProvider.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/FusedPrintersProvider.java
@@ -254,6 +254,9 @@ public class FusedPrintersProvider extends Loader<List<PrinterInfo>> {
if (isStarted() && mDiscoverySession != null
&& mDiscoverySession.isPrinterDiscoveryStarted()) {
if (mTrackedPrinter != null) {
+ if (mTrackedPrinter.equals(printerId)) {
+ return;
+ }
mDiscoverySession.stopPrinterStateTracking(mTrackedPrinter);
}
mTrackedPrinter = printerId;