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

Commit e168d1fc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Unhide api for setHotwordDetectionServiceConfig" into sc-dev am: d5dc9e47 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13958483

Change-Id: Ia43f1abad77acf88cff962cf66844985381f9fe0
parents a8a4c83a d5dc9e47

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10357,6 +10357,7 @@ package android.service.voice { 
    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);

    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);

    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

core/java/android/service/voice/AlwaysOnHotwordDetector.java

+11 −13
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ public class AlwaysOnHotwordDetector { 
        mTargetSdkVersion = targetSdkVersion;

        mSupportHotwordDetectionService = supportHotwordDetectionService;

        if (mSupportHotwordDetectionService) {

            setHotwordDetectionServiceConfig(options, sharedMemory);

            updateState(options, sharedMemory);

        }

        try {

            Identity identity = new Identity();
@@ -573,30 +573,28 @@ public class AlwaysOnHotwordDetector { 
    /**

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

     *

     * @param options Application configuration data provided by the

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

     * @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.

     * @param sharedMemory The unrestricted data blob provided by the

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

     * @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 it doesn't support hotword detection service.

     *

     * @hide

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

     * {@link HotwordDetectionService} when it was created.

     */

    public final void setHotwordDetectionServiceConfig(@Nullable PersistableBundle options,

    public final void updateState(@Nullable PersistableBundle options,

            @Nullable SharedMemory sharedMemory) {

        if (DBG) {

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

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

        }

        if (!mSupportHotwordDetectionService) {

            throw new IllegalStateException(

                    "setHotwordDetectionServiceConfig called, but it doesn't support hotword"

                            + " detection service");

                    "updateState called, but it doesn't support hotword detection service");

        }



        try {

            mModelManagementService.setHotwordDetectionServiceConfig(options, sharedMemory);

            mModelManagementService.updateState(options, sharedMemory);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

core/java/android/service/voice/HotwordDetectionService.java

+8 −8
Original line number Diff line number Diff line
@@ -82,10 +82,10 @@ public abstract class HotwordDetectionService extends Service { 
        }



        @Override

        public void setConfig(PersistableBundle options, SharedMemory sharedMemory)

        public void updateState(PersistableBundle options, SharedMemory sharedMemory)

                throws RemoteException {

            if (DBG) {

                Log.d(TAG, "#setConfig");

                Log.d(TAG, "#updateState");

            }

            mHandler.sendMessage(obtainMessage(HotwordDetectionService::onUpdateState,

                    HotwordDetectionService.this,
@@ -139,14 +139,14 @@ public abstract class HotwordDetectionService extends Service { 
    /**

     * Called when the {@link VoiceInteractionService#createAlwaysOnHotwordDetector(String, Locale,

     * PersistableBundle, SharedMemory, AlwaysOnHotwordDetector.Callback)} or

     * {@link AlwaysOnHotwordDetector#setHotwordDetectionServiceConfig(PersistableBundle,

     * SharedMemory)} requests an update of the hotword detection parameters.

     * {@link AlwaysOnHotwordDetector#updateState(PersistableBundle, SharedMemory)} requests an

     * update of the hotword detection parameters.

     *

     * @param options Application configuration data provided by the

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

     * @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.

     * @param sharedMemory The unrestricted data blob provided by the

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

     * @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.

     *

     * @hide

core/java/android/service/voice/IHotwordDetectionService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -34,5 +34,5 @@ oneway interface IHotwordDetectionService { 
    long timeoutMillis,

    in IDspHotwordDetectionCallback callback);



    void setConfig(in PersistableBundle options, in SharedMemory sharedMemory);

    void updateState(in PersistableBundle options, in SharedMemory sharedMemory);

}

core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl

+5 −6
Original line number Diff line number Diff line
@@ -229,15 +229,14 @@ interface IVoiceInteractionManagerService { 
    /**

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

     *

     * @param options Application configuration data provided by the

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

     * @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.

     * @param sharedMemory The unrestricted data blob provided by the

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

     * @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.

     */

    void setHotwordDetectionServiceConfig(

            in PersistableBundle options, in SharedMemory sharedMemory);

    void updateState(in PersistableBundle options, in SharedMemory sharedMemory);



    /**

     * Requests to shutdown hotword detection service.