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

Commit 17675424 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "update HotwordDetector exception throws"

parents d3258e0a d7f42e08

core/api/system-current.txt

+20 −17
Original line number Diff line number Diff line
@@ -11866,20 +11866,20 @@ package android.service.trust { 
package android.service.voice {









  public class AlwaysOnHotwordDetector implements android.service.voice.HotwordDetector {









    method @Nullable public android.content.Intent createEnrollIntent();









    method @Nullable public android.content.Intent createReEnrollIntent();









    method @Nullable public android.content.Intent createUnEnrollIntent();









    method @RequiresPermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD}) public int getParameter(int);









    method @Nullable public android.content.Intent createEnrollIntent() throws android.service.voice.HotwordDetector.IllegalDetectorStateException;









    method @Nullable public android.content.Intent createReEnrollIntent() throws android.service.voice.HotwordDetector.IllegalDetectorStateException;









    method @Nullable public android.content.Intent createUnEnrollIntent() throws android.service.voice.HotwordDetector.IllegalDetectorStateException;









    method @RequiresPermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD}) public int getParameter(int) throws android.service.voice.HotwordDetector.IllegalDetectorStateException;









    method public int getSupportedAudioCapabilities();









    method public int getSupportedRecognitionModes();









    method @Nullable @RequiresPermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD}) public android.service.voice.AlwaysOnHotwordDetector.ModelParamRange queryParameter(int);









    method @RequiresPermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD}) public int setParameter(int, int);









    method @RequiresPermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD}) public boolean startRecognition(int, @NonNull byte[]);









    method @RequiresPermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD}) public boolean startRecognition(int);









    method @RequiresPermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD}) public boolean startRecognition();









    method public boolean startRecognition(@NonNull android.os.ParcelFileDescriptor, @NonNull android.media.AudioFormat, @Nullable android.os.PersistableBundle);









    method @RequiresPermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD}) public boolean stopRecognition();









    method public final void updateState(@Nullable android.os.PersistableBundle, @Nullable android.os.SharedMemory);









    method public int getSupportedRecognitionModes() throws android.service.voice.HotwordDetector.IllegalDetectorStateException;









    method @Nullable @RequiresPermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD}) public android.service.voice.AlwaysOnHotwordDetector.ModelParamRange queryParameter(int) throws android.service.voice.HotwordDetector.IllegalDetectorStateException;









    method @RequiresPermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD}) public int setParameter(int, int) throws android.service.voice.HotwordDetector.IllegalDetectorStateException;









    method @RequiresPermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD}) public boolean startRecognition(int, @NonNull byte[]) throws android.service.voice.HotwordDetector.IllegalDetectorStateException;









    method @RequiresPermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD}) public boolean startRecognition(int) throws android.service.voice.HotwordDetector.IllegalDetectorStateException;









    method @RequiresPermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD}) public boolean startRecognition() throws android.service.voice.HotwordDetector.IllegalDetectorStateException;









    method public boolean startRecognition(@NonNull android.os.ParcelFileDescriptor, @NonNull android.media.AudioFormat, @Nullable android.os.PersistableBundle) throws android.service.voice.HotwordDetector.IllegalDetectorStateException;









    method @RequiresPermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD}) public boolean stopRecognition() throws android.service.voice.HotwordDetector.IllegalDetectorStateException;









    method public final void updateState(@Nullable android.os.PersistableBundle, @Nullable android.os.SharedMemory) throws android.service.voice.HotwordDetector.IllegalDetectorStateException;









    field public static final int AUDIO_CAPABILITY_ECHO_CANCELLATION = 1; // 0x1









    field public static final int AUDIO_CAPABILITY_NOISE_SUPPRESSION = 2; // 0x2









    field public static final int MODEL_PARAM_THRESHOLD_FACTOR = 0; // 0x0








@@ -11986,10 +11986,10 @@ package android.service.voice {















  public interface HotwordDetector {









    method public default void destroy();









    method @RequiresPermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD}) public boolean startRecognition();









    method public boolean startRecognition(@NonNull android.os.ParcelFileDescriptor, @NonNull android.media.AudioFormat, @Nullable android.os.PersistableBundle);









    method public boolean stopRecognition();









    method public void updateState(@Nullable android.os.PersistableBundle, @Nullable android.os.SharedMemory);









    method @RequiresPermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD}) public boolean startRecognition() throws android.service.voice.HotwordDetector.IllegalDetectorStateException;









    method public boolean startRecognition(@NonNull android.os.ParcelFileDescriptor, @NonNull android.media.AudioFormat, @Nullable android.os.PersistableBundle) throws android.service.voice.HotwordDetector.IllegalDetectorStateException;









    method public boolean stopRecognition() throws android.service.voice.HotwordDetector.IllegalDetectorStateException;









    method public void updateState(@Nullable android.os.PersistableBundle, @Nullable android.os.SharedMemory) throws android.service.voice.HotwordDetector.IllegalDetectorStateException;









  }

















  public static interface HotwordDetector.Callback {








@@ -12002,6 +12002,9 @@ package android.service.voice {







    method public void onRejected(@NonNull android.service.voice.HotwordRejectedResult);









  }

















  public static class HotwordDetector.IllegalDetectorStateException extends android.util.AndroidException {









  }

















  public final class HotwordRejectedResult implements android.os.Parcelable {









    method public int describeContents();









    method public int getConfidenceLevel();

























core/java/android/service/voice/AbstractHotwordDetector.java



+19
−11






























Original line number
Diff line number
Diff line







@@ -22,6 +22,7 @@ import android.annotation.CallSuper;







import android.annotation.NonNull;









import android.annotation.Nullable;









import android.app.ActivityThread;









import android.app.compat.CompatChanges;









import android.media.AudioFormat;









import android.media.permission.Identity;









import android.os.Handler;








@@ -80,7 +81,7 @@ abstract class AbstractHotwordDetector implements HotwordDetector {







    public boolean startRecognition(









            @NonNull ParcelFileDescriptor audioStream,









            @NonNull AudioFormat audioFormat,









            @Nullable PersistableBundle options) {









            @Nullable PersistableBundle options) throws IllegalDetectorStateException {









        if (DEBUG) {









            Slog.i(TAG, "#recognizeHotword");









        }








@@ -105,19 +106,22 @@ abstract class AbstractHotwordDetector implements HotwordDetector {







     * Set configuration and pass read-only data to hotword detection service.









     *









     * @param options Application configuration data to provide to the









     * {@link HotwordDetectionService}. PersistableBundle does not allow any remotable objects or









     * other contents that can be used to communicate with other processes.









     *         {@link HotwordDetectionService}. PersistableBundle does not allow any remotable









     *         objects or other contents that can be used to communicate with other processes.









     * @param sharedMemory The unrestricted data blob to provide to the









     *         {@link HotwordDetectionService}. Use this to provide the hotword models data or other









     *         such data to the trusted process.









     *









     * @throws IllegalStateException if this AlwaysOnHotwordDetector wasn't specified to use a









     * {@link HotwordDetectionService} when it was created. In addition, if this









     * AlwaysOnHotwordDetector is in an invalid or error state.









     * @throws IllegalDetectorStateException Thrown when a caller has a target SDK of









     *         Android Tiramisu or above and attempts to start a recognition when the detector is









     *         not able based on the state. Because the caller receives updates via an asynchronous









     *         callback and the state of the detector can change without caller's knowledge, a









     *         checked exception is thrown.









     * @throws IllegalStateException if this HotwordDetector wasn't specified to use a









     *         {@link HotwordDetectionService} when it was created.









     */









    @Override









    public void updateState(@Nullable PersistableBundle options,









            @Nullable SharedMemory sharedMemory) {









            @Nullable SharedMemory sharedMemory) throws IllegalDetectorStateException {









        if (DEBUG) {









            Slog.d(TAG, "updateState()");









        }








@@ -163,9 +167,13 @@ abstract class AbstractHotwordDetector implements HotwordDetector {







        }









    }



















    protected void throwIfDetectorIsNoLongerActive() {









    protected void throwIfDetectorIsNoLongerActive() throws IllegalDetectorStateException {









        if (!mIsDetectorActive.get()) {









            Slog.e(TAG, "attempting to use a destroyed detector which is no longer active");









            if (CompatChanges.isChangeEnabled(HOTWORD_DETECTOR_THROW_CHECKED_EXCEPTION)) {









                throw new IllegalDetectorStateException(









                        "attempting to use a destroyed detector which is no longer active");









            }









            throw new IllegalStateException(









                    "attempting to use a destroyed detector which is no longer active");









        }