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

Commit ab5fedc6 authored by Bhalchandra Gajare's avatar Bhalchandra Gajare
Browse files

AudioAttributes: update setHotwordMode to setHotwordModeEnabled 

Update setHotwordMode to setHotwordModeEnabled and set/clear the hotword
mode based on the boolean flag passed to setHotwordModeEnabled. This is
to meet the API requirements. Also update the references to this API.

BUG: 180419637
Test: Able to setHotwordModeEnabled from AGSA application. Confirmed
HAL receives the flag and audioSource correctly in open_input_stream.

Change-Id: Ia01e8b5f3edaeafc9617846efc247635005456a8
parent c22aff4e

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5095,7 +5095,7 @@ package android.media { 
  public static class AudioAttributes.Builder {

    method public android.media.AudioAttributes.Builder addBundle(@NonNull android.os.Bundle);

    method public android.media.AudioAttributes.Builder setCapturePreset(int);

    method @NonNull @RequiresPermission(android.Manifest.permission.CAPTURE_AUDIO_HOTWORD) public android.media.AudioAttributes.Builder setHotwordMode();

    method @NonNull @RequiresPermission(android.Manifest.permission.CAPTURE_AUDIO_HOTWORD) public android.media.AudioAttributes.Builder setHotwordModeEnabled(boolean);

    method public android.media.AudioAttributes.Builder setInternalCapturePreset(int);

    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public android.media.AudioAttributes.Builder setSystemUsage(int);

  }

media/java/android/media/AudioAttributes.java

+6 −2
Original line number Diff line number Diff line
@@ -870,8 +870,12 @@ public final class AudioAttributes implements Parcelable { 
         */

        @SystemApi

        @RequiresPermission(android.Manifest.permission.CAPTURE_AUDIO_HOTWORD)

        public @NonNull Builder setHotwordMode() {

        public @NonNull Builder setHotwordModeEnabled(boolean enable) {

            if (enable) {

                mFlags |= FLAG_HW_HOTWORD;

            } else {

                mFlags &= ~FLAG_HW_HOTWORD;

            }

            return this;

        }

services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ final class HotwordDetectionConnection { 
        }

        try {

            AudioRecord audioRecord = new AudioRecord(

                    new AudioAttributes.Builder().setHotwordMode().build(),

                    new AudioAttributes.Builder().setHotwordModeEnabled(true).build(),

                    audioFormat,

                    getBufferSizeInBytes(

                            audioFormat.getSampleRate(),