commit 09854a9b3eb75ebe60ff6bbebda2ba11ed06f9aa
author Svetoslav Ganov <svetoslavganov@google.com> Mon Oct 14 10:51:29 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 14 10:51:29 2013 -0700
tree 85e92dbb887cb912f9f9cd2a075dcb6dc5ad10ab
parent 0f58327f6a4a7d808071ddab236407be31791fc7
parent c7db28558d737d2d06fc2f0545f19350dc603666

am c7db2855: am 64ee79dd: am 3cccec4c: Merge "The callbacks for tracking a printer called more than once without printer change." into klp-dev

* commit 'c7db28558d737d2d06fc2f0545f19350dc603666':
  The callbacks for tracking a printer called more than once without printer change.

packages/PrintSpooler/src/com/android/printspooler/FusedPrintersProvider.java

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 @@
         if (isStarted() && mDiscoverySession != null
                 && mDiscoverySession.isPrinterDiscoveryStarted()) {
             if (mTrackedPrinter != null) {
+                if (mTrackedPrinter.equals(printerId)) {
+                    return;
+                }
                 mDiscoverySession.stopPrinterStateTracking(mTrackedPrinter);
             }
             mTrackedPrinter = printerId;