diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2013-04-23 11:16:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-23 11:16:22 -0700 |
| commit | 0169b26adf63f4da5c8b7b2170f3b1190c360583 (patch) | |
| tree | 8b13f4f273c4666f821488bd21e88af1ff27bc13 /media/java | |
| parent | bf7b95cec91c83c86711d220284e4a3d247e1081 (diff) | |
| parent | 448c6ca48144b324ca1e98962bd5dd06451a355e (diff) | |
| download | frameworks_base-0169b26adf63f4da5c8b7b2170f3b1190c360583.zip frameworks_base-0169b26adf63f4da5c8b7b2170f3b1190c360583.tar.gz frameworks_base-0169b26adf63f4da5c8b7b2170f3b1190c360583.tar.bz2 | |
am 448c6ca4: am ea236f19: Merge "Identify in logs launch of voice search from key events" into jb-mr2-dev
* commit '448c6ca48144b324ca1e98962bd5dd06451a355e':
Identify in logs launch of voice search from key events
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) { |