| commit | 96d7fac4e34616ce5d297d3d0469e3b8aec5e36e | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Sep 17 19:39:26 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 17 19:39:26 2024 +0000 |
| tree | c4e430e52a8eb333ce22377363615e3f5a61d330 | |
| parent | 1b7f45a1551d07198762eb382056c9a5a6867680 [diff] | |
| parent | 1b6139e1937dafb7fd5fe69e0d1c33b1cabd620f [diff] |
Merge "AudioTrack: Enable CONTENT_TYPE_SPEECH for automatic power savings" into main am: 1b6139e193 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3268077 Change-Id: I0dfe4f6f11e4506db714f787117caadda6b491db Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java index 73deb17..03cd535 100644 --- a/media/java/android/media/AudioTrack.java +++ b/media/java/android/media/AudioTrack.java
@@ -1797,6 +1797,7 @@ (flags != 0 // cannot have any special flags || attributes.getUsage() != AudioAttributes.USAGE_MEDIA || (attributes.getContentType() != AudioAttributes.CONTENT_TYPE_UNKNOWN + && attributes.getContentType() != AudioAttributes.CONTENT_TYPE_SPEECH && attributes.getContentType() != AudioAttributes.CONTENT_TYPE_MUSIC && attributes.getContentType() != AudioAttributes.CONTENT_TYPE_MOVIE))) { return false;