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

Commit 41e61c6c authored by Ytai Ben-Tsvi's avatar Ytai Ben-Tsvi
Browse files

Small syntactic cleanups 

Test: compiles
Change-Id: Ic93d025e3152b165f72df533ec6d94770df4c184
parent 72695ffa

services/core/java/com/android/server/soundtrigger_middleware/ISoundTriggerHw2.java

+38 −46
Original line number Original line Diff line number Diff line
@@ -16,12 +16,17 @@ 




package com.android.server.soundtrigger_middleware;

package com.android.server.soundtrigger_middleware;





import android.hardware.soundtrigger.V2_3.ModelParameterRange;

import android.hardware.soundtrigger.V2_3.Properties;

import android.hardware.soundtrigger.V2_3.RecognitionConfig;

import android.hardware.soundtrigger.V2_4.ISoundTriggerHw;

import android.hardware.soundtrigger.V2_4.ISoundTriggerHwCallback;

import android.hardware.soundtrigger.V2_4.ISoundTriggerHwGlobalCallback;

import android.hidl.base.V1_0.IBase;

import android.hidl.base.V1_0.IBase;

import android.os.IHwBinder;

import android.os.IHwBinder;





/**

/**

 * This interface mimics android.hardware.soundtrigger.V2_x.ISoundTriggerHw and

 * This interface mimics ISoundTriggerHw and ISoundTriggerHwCallback, with a few key differences:

 * android.hardware.soundtrigger.V2_x.ISoundTriggerHwCallback, with a few key differences:

 * <ul>

 * <ul>

 * <li>Methods in the original interface generally have a status return value and potentially a

 * <li>Methods in the original interface generally have a status return value and potentially a

 * second return value which is the actual return value. This is reflected via a synchronous

 * second return value which is the actual return value. This is reflected via a synchronous
@@ -52,78 +57,67 @@ import android.os.IHwBinder; 
 */

 */

interface ISoundTriggerHw2 {

interface ISoundTriggerHw2 {

    /**

    /**

     * @see android.hardware.soundtrigger.V2_3.ISoundTriggerHw#getProperties_2_3(

     * @see ISoundTriggerHw#getProperties_2_3(ISoundTriggerHw.getProperties_2_3Callback)

     *              android.hardware.soundtrigger.V2_3.ISoundTriggerHw.getProperties_2_3Callback)

     */

     */

    android.hardware.soundtrigger.V2_3.Properties getProperties();

    Properties getProperties();





    /**

    /**

     * @see android.hardware.soundtrigger.V2_4.ISoundTriggerHw#registerGlobalCallback(

     * @see ISoundTriggerHw#registerGlobalCallback(ISoundTriggerHwGlobalCallback)

     *              android.hardware.soundtrigger.V2_4.ISoundTriggerHwGlobalCallback)

     */

     */

    void registerCallback(GlobalCallback callback);

    void registerCallback(GlobalCallback callback);





    /**

    /**

     * @see android.hardware.soundtrigger.V2_4.ISoundTriggerHw#loadSoundModel_2_4(

     * @see ISoundTriggerHw#loadSoundModel_2_4(

     *              android.hardware.soundtrigger.V2_1.ISoundTriggerHw.SoundModel,

     *              ISoundTriggerHw.SoundModel,

     *              android.hardware.soundtrigger.V2_4.ISoundTriggerHwCallback,

     *              ISoundTriggerHwCallback,

     *              android.hardware.soundtrigger.V2_4.ISoundTriggerHw.loadSoundModel_2_4Callback)

     *              ISoundTriggerHw.loadSoundModel_2_4Callback)

     */

     */

    int loadSoundModel(

    int loadSoundModel(ISoundTriggerHw.SoundModel soundModel, ModelCallback callback);

            android.hardware.soundtrigger.V2_1.ISoundTriggerHw.SoundModel soundModel,

            ModelCallback callback);





    /**

    /**

     * @see android.hardware.soundtrigger.V2_4.ISoundTriggerHw#loadPhraseSoundModel_2_4(

     * @see ISoundTriggerHw#loadPhraseSoundModel_2_4(

     *              android.hardware.soundtrigger.V2_1.ISoundTriggerHw.PhraseSoundModel,

     *              ISoundTriggerHw.PhraseSoundModel,

     *              android.hardware.soundtrigger.V2_4.ISoundTriggerHwCallback,

     *              ISoundTriggerHwCallback,

     *              android.hardware.soundtrigger.V2_4.ISoundTriggerHw.loadPhraseSoundModel_2_4Callback)

     *              ISoundTriggerHw.loadPhraseSoundModel_2_4Callback)

     */

     */

    int loadPhraseSoundModel(

    int loadPhraseSoundModel(ISoundTriggerHw.PhraseSoundModel soundModel, ModelCallback callback);

            android.hardware.soundtrigger.V2_1.ISoundTriggerHw.PhraseSoundModel soundModel,

            ModelCallback callback);





    /**

    /**

     * @see android.hardware.soundtrigger.V2_2.ISoundTriggerHw#unloadSoundModel(int)

     * @see ISoundTriggerHw#unloadSoundModel(int)

     */

     */

    void unloadSoundModel(int modelHandle);

    void unloadSoundModel(int modelHandle);





    /**

    /**

     * @see android.hardware.soundtrigger.V2_2.ISoundTriggerHw#stopRecognition(int)

     * @see ISoundTriggerHw#stopRecognition(int)

     */

     */

    void stopRecognition(int modelHandle);

    void stopRecognition(int modelHandle);





    /**

    /**

     * @see android.hardware.soundtrigger.V2_4.ISoundTriggerHw#startRecognition_2_4(

     * @see ISoundTriggerHw#startRecognition_2_4(int, RecognitionConfig)

     *              int,

     *              android.hardware.soundtrigger.V2_3.RecognitionConfig)

     */

     */

    void startRecognition(int modelHandle,

    void startRecognition(int modelHandle, RecognitionConfig config);

            android.hardware.soundtrigger.V2_3.RecognitionConfig config);





    /**

    /**

     * @see android.hardware.soundtrigger.V2_2.ISoundTriggerHw#getModelState(int)

     * @see ISoundTriggerHw#getModelState(int)

     */

     */

    void getModelState(int modelHandle);

    void getModelState(int modelHandle);





    /**

    /**

     * @see android.hardware.soundtrigger.V2_3.ISoundTriggerHw#getParameter(int, int,

     * @see ISoundTriggerHw#getParameter(int, int, ISoundTriggerHw.getParameterCallback)

     * android.hardware.soundtrigger.V2_3.ISoundTriggerHw.getParameterCallback)

     */

     */

    int getModelParameter(int modelHandle, int param);

    int getModelParameter(int modelHandle, int param);





    /**

    /**

     * @see android.hardware.soundtrigger.V2_3.ISoundTriggerHw#setParameter(int, int, int)

     * @see ISoundTriggerHw#setParameter(int, int, int)

     */

     */

    void setModelParameter(int modelHandle, int param, int value);

    void setModelParameter(int modelHandle, int param, int value);





    /**

    /**

     * @return null if not supported.

     * @return null if not supported.

     * @see android.hardware.soundtrigger.V2_3.ISoundTriggerHw#queryParameter(int, int,

     * @see ISoundTriggerHw#queryParameter(int, int,

     * android.hardware.soundtrigger.V2_3.ISoundTriggerHw.queryParameterCallback)

     * ISoundTriggerHw.queryParameterCallback)

     */

     */

    android.hardware.soundtrigger.V2_3.ModelParameterRange queryParameter(int modelHandle,

    ModelParameterRange queryParameter(int modelHandle, int param);

            int param);





    /**

    /**

     * @see IHwBinder#linkToDeath(IHwBinder.DeathRecipient, long)

     * @see IHwBinder#linkToDeath(IHwBinder.DeathRecipient, long)
@@ -145,23 +139,21 @@ interface ISoundTriggerHw2 { 
     */

     */

    interface ModelCallback {

    interface ModelCallback {

        /**

        /**

         * @see android.hardware.soundtrigger.V2_1.ISoundTriggerHwCallback#recognitionCallback_2_1(

         * @see ISoundTriggerHwCallback#recognitionCallback_2_1(

         *              android.hardware.soundtrigger.V2_1.ISoundTriggerHwCallback.RecognitionEvent,

         *              ISoundTriggerHwCallback.RecognitionEvent,

         *              int)

         *              int)

         */

         */

        void recognitionCallback(

        void recognitionCallback(ISoundTriggerHwCallback.RecognitionEvent event);

                android.hardware.soundtrigger.V2_1.ISoundTriggerHwCallback.RecognitionEvent event);





        /**

        /**

         * @see android.hardware.soundtrigger.V2_1.ISoundTriggerHwCallback#phraseRecognitionCallback_2_1(

         * @see ISoundTriggerHwCallback#phraseRecognitionCallback_2_1(

         *              android.hardware.soundtrigger.V2_1.ISoundTriggerHwCallback.PhraseRecognitionEvent,

         *              ISoundTriggerHwCallback.PhraseRecognitionEvent,

         *              int)

         *              int)

         */

         */

        void phraseRecognitionCallback(

        void phraseRecognitionCallback(ISoundTriggerHwCallback.PhraseRecognitionEvent event);

                android.hardware.soundtrigger.V2_1.ISoundTriggerHwCallback.PhraseRecognitionEvent event);





        /**

        /**

         * @see android.hardware.soundtrigger.V2_4.ISoundTriggerHwCallback#modelUnloaded(int)

         * @see ISoundTriggerHwCallback#modelUnloaded(int)

         */

         */

        void modelUnloaded(int modelHandle);

        void modelUnloaded(int modelHandle);

    }

    }
@@ -171,7 +163,7 @@ interface ISoundTriggerHw2 { 
     */

     */

    interface GlobalCallback {

    interface GlobalCallback {

        /**

        /**

         * @see android.hardware.soundtrigger.V2_4.ISoundTriggerHwGlobalCallback#tryAgain()

         * @see ISoundTriggerHwGlobalCallback#tryAgain()

         */

         */

        void tryAgain();

        void tryAgain();

    }

    }