diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2013-04-23 01:30:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-23 01:30:30 +0000 |
| commit | ea236f19e652942a7af384566c70cdd0c7f88c58 (patch) | |
| tree | 98cd6cdd13f99bb6788f45fa6372abfc9de2f077 /media/java | |
| parent | f78ff07f6e688d11881658f743ef63076fcc550c (diff) | |
| parent | 924f1b962c3a8e700a695cb65cb07c17cf90c696 (diff) | |
| download | frameworks_base-ea236f19e652942a7af384566c70cdd0c7f88c58.zip frameworks_base-ea236f19e652942a7af384566c70cdd0c7f88c58.tar.gz frameworks_base-ea236f19e652942a7af384566c70cdd0c7f88c58.tar.bz2 | |
Merge "Identify in logs launch of voice search from key events" into jb-mr2-dev
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/AudioService.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 0cff77d..e237194 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -4699,10 +4699,12 @@ public class AudioService extends IAudioService.Stub implements OnFinished { boolean isLocked = mKeyguardManager != null && mKeyguardManager.isKeyguardLocked(); if (!isLocked && pm.isScreenOn()) { voiceIntent = new Intent(android.speech.RecognizerIntent.ACTION_WEB_SEARCH); + Log.i(TAG, "voice-based interactions: about to use ACTION_WEB_SEARCH"); } else { voiceIntent = new Intent(RecognizerIntent.ACTION_VOICE_SEARCH_HANDS_FREE); voiceIntent.putExtra(RecognizerIntent.EXTRA_SECURE, isLocked && mKeyguardManager.isKeyguardSecure()); + Log.i(TAG, "voice-based interactions: about to use ACTION_VOICE_SEARCH_HANDS_FREE"); } // start the search activity if (needWakeLock) { |