Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AudioAttributes: update setHotwordMode to setHotwordModeEnabled" into sc-dev

Browse Source
This commit is contained in:
Bhalchandra Gajare
2021-04-09 19:30:52 +00:00
committed by Android (Google) Code Review
parent aeeed26dfc ab5fedc682
commit 65cadbe09f
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

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

8
media/java/android/media/AudioAttributes.java
View File

@@ -870,8 +870,12 @@ public final class AudioAttributes implements Parcelable {
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.CAPTURE_AUDIO_HOTWORD)
public @NonNull Builder setHotwordMode() {
mFlags |= FLAG_HW_HOTWORD;
public @NonNull Builder setHotwordModeEnabled(boolean enable) {
if (enable) {
mFlags |= FLAG_HW_HOTWORD;
} else {
mFlags &= ~FLAG_HW_HOTWORD;
}
return this;
}

2
services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java
View File

@@ -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(),