commit c8170ee2055dcaf993391aacef0e54d87561bfdb
author Bjorn Bringert <bringert@android.com> Fri May 07 03:40:31 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri May 07 03:40:31 2010 -0700
tree c238e75d6a0ba31e1042812b8e847b1003420654
parent ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f
parent 75370e74629b4938c4472d6001eebf5e305dbc55

am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo

Merge commit '75370e74629b4938c4472d6001eebf5e305dbc55' into froyo-plus-aosp

* commit '75370e74629b4938c4472d6001eebf5e305dbc55':
  Fixing: RecognitionService logcat spam "cancel called..."

core/java/android/speech/RecognitionService.java

diff --git a/core/java/android/speech/RecognitionService.java b/core/java/android/speech/RecognitionService.java
index 1c1fa95..75a5ed5 100644
--- a/core/java/android/speech/RecognitionService.java
+++ b/core/java/android/speech/RecognitionService.java
@@ -118,7 +118,7 @@
 
     private void dispatchCancel(IRecognitionListener listener) {
         if (mCurrentCallback == null) {
-            Log.w(TAG, "cancel called with no preceding startListening - ignoring");
+            if (DBG) Log.d(TAG, "cancel called with no preceding startListening - ignoring");
         } else if (mCurrentCallback.mListener.asBinder() != listener.asBinder()) {
             Log.w(TAG, "cancel called by client who did not call startListening - ignoring");
         } else { // the correct state