Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1cf2b91f: Merge "Fixing build break" into klp-dev

Browse Source 
* commit '1cf2b91fe533d9e50bce6e5551ae26bccdb4a965':
  Fixing build break
This commit is contained in:
Sandeep Siddhartha
2013-09-06 18:13:44 -07:00
committed by Android Git Automerger
parent 2eb7abce49 1cf2b91fe5
commit ea6c0bcd6b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/speech/hotword/HotwordRecognitionService.java
View File

@@ -227,7 +227,7 @@ public abstract class HotwordRecognitionService extends Service {
/** /**
* Called on an event of interest to the client. * Called on an event of interest to the client.
* *
* @param eventType the event type. Event types are defined in {@link HotwordRecognizer}. * @param eventType the event type.
* @param eventBundle a Bundle containing the hotword event(s). * @param eventBundle a Bundle containing the hotword event(s).
*/ */
public void onHotwordEvent(int eventType, Bundle eventBundle) throws RemoteException { public void onHotwordEvent(int eventType, Bundle eventBundle) throws RemoteException {
@@ -237,7 +237,7 @@ public abstract class HotwordRecognitionService extends Service {
/** /**
* Called back when hotword is detected. * Called back when hotword is detected.
* *
* @param intent for the activity to launch, post hotword detection. * @param activityIntent for the activity to launch, post hotword detection.
*/ */
public void onHotwordRecognized(Intent activityIntent) throws RemoteException { public void onHotwordRecognized(Intent activityIntent) throws RemoteException {
mListener.onHotwordRecognized(activityIntent); mListener.onHotwordRecognized(activityIntent);
@@ -247,7 +247,6 @@ public abstract class HotwordRecognitionService extends Service {
* Called when the HotwordRecognitionService encounters an error. * Called when the HotwordRecognitionService encounters an error.
* *
* @param errorCode the error code describing the error that was encountered. * @param errorCode the error code describing the error that was encountered.
* Error codes are defined in {@link HotwordRecognizer}.
*/ */
public void onError(int errorCode) throws RemoteException { public void onError(int errorCode) throws RemoteException {
mListener.onHotwordError(errorCode); mListener.onHotwordError(errorCode);