Touch up the Hotword API

- Few comments got missed from the last review

Change-Id: I933912c51794875be5d129351d4f06bc040537a6

diff --git a/core/java/android/speech/hotword/HotwordRecognitionService.java b/core/java/android/speech/hotword/HotwordRecognitionService.java
index 4a89593..c16d2a9 100644 (file)
--- a/core/java/android/speech/hotword/HotwordRecognitionService.java
+++ b/core/java/android/speech/hotword/HotwordRecognitionService.java
@@ -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);
         }

diff --git a/core/java/android/speech/hotword/HotwordRecognizer.java b/core/java/android/speech/hotword/HotwordRecognizer.java
index bdb59f7..c6bd1f3 100644 (file)
--- a/core/java/android/speech/hotword/HotwordRecognizer.java
+++ b/core/java/android/speech/hotword/HotwordRecognizer.java
@@ -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));