Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut

package android.speech;

package android.speech;

import android.os.Bundle;

import android.content.Intent;

import android.speech.IRecognitionListener;

import android.speech.IRecognitionListener;

// A Service interface to speech recognition. Call startListening when

// A Service interface to speech recognition. Call startListening when

/** {@hide} */

/** {@hide} */

interface IRecognitionService {

interface IRecognitionService {

    // Start listening for speech. Can only call this from one thread at once.

    // Start listening for speech. Can only call this from one thread at once.

    void startListening(in Bundle recognitionParams,

    // see RecognizerIntent.java for constants used to specify the intent.

    void startListening(in Intent recognizerIntent,

        in IRecognitionListener listener);

        in IRecognitionListener listener);

    void cancel();

    void cancel();