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

am 4e22b851: Merge "Touch up the Hotword API" into klp-dev

Browse Source 
* commit '4e22b851be121ef221c31c5c4fe12b770eb3e812':
  Touch up the Hotword API
This commit is contained in:
Sandeep Siddhartha
2013-08-26 19:25:54 -07:00
committed by Android Git Automerger
parent 646dba8330 4e22b851be
commit a9e0d7b952
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,7 +152,7 @@ public abstract class HotwordRecognitionService extends Service {
}
try {
Log.e(TAG, "Recognition service called without RECORD_AUDIO permissions");
listener.onHotwordError(HotwordRecognizer.ERROR_INSUFFICIENT_PERMISSIONS);
listener.onHotwordError(HotwordRecognizer.ERROR_FAILED);
} catch (RemoteException e) {
Log.e(TAG, "onHotwordError(ERROR_INSUFFICIENT_PERMISSIONS) message failed", e);
}

8
core/java/android/speech/hotword/HotwordRecognizer.java
View File

@@ -67,8 +67,8 @@ public class HotwordRecognizer {
/** RecognitionService busy. */
public static final int ERROR_RECOGNIZER_BUSY = 2;
/** Insufficient permissions */
public static final int ERROR_INSUFFICIENT_PERMISSIONS = 3;
/** This indicates a permanent failure and the clients shouldn't retry on this */
public static final int ERROR_FAILED = 3;
/** Client-side errors */
public static final int ERROR_CLIENT = 4;
@@ -77,7 +77,7 @@ public class HotwordRecognizer {
public static final int ERROR_TIMEOUT = 5;
/** The service received concurrent start calls */
public static final int WARNING_SERVICE_ALREADY_STARTED = 6;
public static final int ERROR_SERVICE_ALREADY_STARTED = 6;
/** action codes */
private static final int MSG_START = 1;
@@ -223,7 +223,7 @@ public class HotwordRecognizer {
return;
}
} else {
mListener.onHotwordError(WARNING_SERVICE_ALREADY_STARTED);
mListener.onHotwordError(ERROR_SERVICE_ALREADY_STARTED);
return;
}
putMessage(Message.obtain(mHandler, MSG_START));