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

Commit e7c0dc32 authored by Ziyang Cheng's avatar Ziyang Cheng Committed by Android (Google) Code Review
Browse files

Merge "Add WorkerThread annotation to SoundTriggerManager apis." into main

parents 01e0027b f72d1115

core/api/system-current.txt

+6 −6
Original line number Diff line number Diff line
@@ -8094,16 +8094,16 @@ package android.media.soundtrigger { 
    method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) public void deleteModel(java.util.UUID);

    method public int getDetectionServiceOperationsTimeout();

    method @Deprecated @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) public android.media.soundtrigger.SoundTriggerManager.Model getModel(java.util.UUID);

    method @FlaggedApi("android.media.soundtrigger.manager_api") @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) public int getModelState(@NonNull java.util.UUID);

    method @FlaggedApi("android.media.soundtrigger.manager_api") @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) @WorkerThread public int getModelState(@NonNull java.util.UUID);

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) public android.hardware.soundtrigger.SoundTrigger.ModuleProperties getModuleProperties();

    method @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) public int getParameter(@NonNull java.util.UUID, int);

    method @FlaggedApi("android.media.soundtrigger.manager_api") @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) public boolean isRecognitionActive(@NonNull java.util.UUID);

    method @FlaggedApi("android.media.soundtrigger.manager_api") @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) public int loadSoundModel(@NonNull android.hardware.soundtrigger.SoundTrigger.SoundModel);

    method @FlaggedApi("android.media.soundtrigger.manager_api") @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) @WorkerThread public boolean isRecognitionActive(@NonNull java.util.UUID);

    method @FlaggedApi("android.media.soundtrigger.manager_api") @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) @WorkerThread public int loadSoundModel(@NonNull android.hardware.soundtrigger.SoundTrigger.SoundModel);

    method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) public android.hardware.soundtrigger.SoundTrigger.ModelParamRange queryParameter(@Nullable java.util.UUID, int);

    method @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) public int setParameter(@Nullable java.util.UUID, int, int);

    method @FlaggedApi("android.media.soundtrigger.manager_api") @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) public int startRecognition(@NonNull java.util.UUID, @Nullable android.os.Bundle, @NonNull android.content.ComponentName, @NonNull android.hardware.soundtrigger.SoundTrigger.RecognitionConfig);

    method @FlaggedApi("android.media.soundtrigger.manager_api") @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) public int stopRecognition(@NonNull java.util.UUID);

    method @FlaggedApi("android.media.soundtrigger.manager_api") @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) public int unloadSoundModel(@NonNull java.util.UUID);

    method @FlaggedApi("android.media.soundtrigger.manager_api") @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) @WorkerThread public int startRecognition(@NonNull java.util.UUID, @Nullable android.os.Bundle, @NonNull android.content.ComponentName, @NonNull android.hardware.soundtrigger.SoundTrigger.RecognitionConfig);

    method @FlaggedApi("android.media.soundtrigger.manager_api") @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) @WorkerThread public int stopRecognition(@NonNull java.util.UUID);

    method @FlaggedApi("android.media.soundtrigger.manager_api") @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) @WorkerThread public int unloadSoundModel(@NonNull java.util.UUID);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER) public void updateModel(android.media.soundtrigger.SoundTriggerManager.Model);

  }

























media/java/android/media/soundtrigger/SoundTriggerManager.java



+7
−0




























Original line number
Diff line number
Diff line








@@ -27,6 +27,7 @@ import android.annotation.SuppressLint;













import android.annotation.SystemApi;















import android.annotation.SystemService;















import android.annotation.TestApi;













import android.annotation.WorkerThread;















import android.app.ActivityThread;















import android.compat.annotation.UnsupportedAppUsage;















import android.content.ComponentName;










@@ -475,6 +476,7 @@ public final class SoundTriggerManager {













    @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER)















    @UnsupportedAppUsage















    @FlaggedApi(Flags.FLAG_MANAGER_API)













    @WorkerThread















    public int loadSoundModel(@NonNull SoundModel soundModel) {















        if (mSoundTriggerSession == null) {















            throw new IllegalStateException("No underlying SoundTriggerModule available");










@@ -518,6 +520,7 @@ public final class SoundTriggerManager {













    @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER)















    @UnsupportedAppUsage















    @FlaggedApi(Flags.FLAG_MANAGER_API)













    @WorkerThread















    public int startRecognition(@NonNull UUID soundModelId, @Nullable Bundle params,















        @NonNull ComponentName detectionService, @NonNull RecognitionConfig config) {















        Objects.requireNonNull(soundModelId);









@@ -544,6 +547,7 @@ public final class SoundTriggerManager {













    @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER)















    @UnsupportedAppUsage















    @FlaggedApi(Flags.FLAG_MANAGER_API)













    @WorkerThread















    public int stopRecognition(@NonNull UUID soundModelId) {















        if (mSoundTriggerSession == null) {















            throw new IllegalStateException("No underlying SoundTriggerModule available");









@@ -568,6 +572,7 @@ public final class SoundTriggerManager {













    @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER)















    @UnsupportedAppUsage















    @FlaggedApi(Flags.FLAG_MANAGER_API)













    @WorkerThread















    public int unloadSoundModel(@NonNull UUID soundModelId) {















        if (mSoundTriggerSession == null) {















            throw new IllegalStateException("No underlying SoundTriggerModule available");









@@ -587,6 +592,7 @@ public final class SoundTriggerManager {













    @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER)















    @UnsupportedAppUsage















    @FlaggedApi(Flags.FLAG_MANAGER_API)













    @WorkerThread















    public boolean isRecognitionActive(@NonNull UUID soundModelId) {















        if (soundModelId == null || mSoundTriggerSession == null) {















            return false;










@@ -624,6 +630,7 @@ public final class SoundTriggerManager {













    @RequiresPermission(android.Manifest.permission.MANAGE_SOUND_TRIGGER)















    @UnsupportedAppUsage















    @FlaggedApi(Flags.FLAG_MANAGER_API)













    @WorkerThread















    public int getModelState(@NonNull UUID soundModelId) {















        if (mSoundTriggerSession == null) {















            throw new IllegalStateException("No underlying SoundTriggerModule available");