Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 448c6ca4 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android Git Automerger
Browse files

am ea236f19: Merge "Identify in logs launch of voice search from key events" into jb-mr2-dev 

* commit 'ea236f19':
  Identify in logs launch of voice search from key events
parents 2fd0ba8e ea236f19

media/java/android/media/AudioService.java

+2 −0
Original line number Diff line number Diff line
@@ -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) {