commit c7db28558d737d2d06fc2f0545f19350dc603666
author Svetoslav Ganov <svetoslavganov@google.com> Sun Oct 13 12:15:13 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sun Oct 13 12:15:13 2013 -0700
tree 6fd85f7313a4d4d674f30324a911b95fe436a024
parent b0d1ee9033e72a457f19563c966cd28ed647aa83
parent 64ee79dd2d0b7a5bdff2590f252661d2fa5f76d7

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.

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;