diff options
3 files changed, 11 insertions, 6 deletions
diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java index 597f915ecdf9..354075ea1762 100644 --- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java +++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java @@ -298,6 +298,10 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { } } + public ModuleProperties getModuleProperties() { + return moduleProperties; + } + //---- SoundTrigger.StatusListener methods @Override public void onRecognition(RecognitionEvent event) { diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerInternal.java b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerInternal.java index 0a06bfa9bef9..772287624f6a 100644 --- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerInternal.java +++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerInternal.java @@ -44,9 +44,6 @@ public abstract class SoundTriggerInternal { public static final int STATUS_ERROR = SoundTrigger.STATUS_ERROR; public static final int STATUS_OK = SoundTrigger.STATUS_OK; - /** The {@link ModuleProperties} for the system, or null if none exists. */ - private ModuleProperties moduleProperties; - /** * Starts recognition for the given keyphraseId. * @@ -76,9 +73,7 @@ public abstract class SoundTriggerInternal { */ public abstract void stopAllRecognitions(); - public ModuleProperties getModuleProperties() { - return moduleProperties; - } + public abstract ModuleProperties getModuleProperties(); public abstract void dump(FileDescriptor fd, PrintWriter pw, String[] args); } diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java index 5e8fe9ef8caf..682f4a412f0e 100644 --- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java +++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java @@ -23,6 +23,7 @@ import android.hardware.soundtrigger.IRecognitionStatusCallback; import android.hardware.soundtrigger.SoundTrigger; import android.hardware.soundtrigger.SoundTrigger.GenericSoundModel; import android.hardware.soundtrigger.SoundTrigger.KeyphraseSoundModel; +import android.hardware.soundtrigger.SoundTrigger.ModuleProperties; import android.hardware.soundtrigger.SoundTrigger.RecognitionConfig; import android.os.Parcel; import android.os.ParcelUuid; @@ -180,6 +181,11 @@ public class SoundTriggerService extends SystemService { } @Override + public ModuleProperties getModuleProperties() { + return mSoundTriggerHelper.getModuleProperties(); + } + + @Override public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { mSoundTriggerHelper.dump(fd, pw, args); } |