diff options
| author | 2022-09-08 18:22:15 +0000 | |
|---|---|---|
| committer | 2022-09-08 18:22:15 +0000 | |
| commit | ef3ecceecd7036a892dec2773675ddece1457f66 (patch) | |
| tree | 3d1fa25268b2d55356fd6bd4b9e141f22c86ba17 | |
| parent | cf4f22e8a784af22ae05d73222a71a17aa33b7ce (diff) | |
| parent | 7d35eaf6d7ae28b36043a605a20c46a2196f76b5 (diff) | |
Merge "SpatializerHelper: Fix device compatibility with spatial audio" am: fe4b37a3ac am: 7d35eaf6d7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2209998
Change-Id: I9980559698ffc3496dbce5a78a6300cc12eac763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/audio/SpatializerHelper.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/audio/SpatializerHelper.java b/services/core/java/com/android/server/audio/SpatializerHelper.java index dd44af1b68ee..e4fdea742c5b 100644 --- a/services/core/java/com/android/server/audio/SpatializerHelper.java +++ b/services/core/java/com/android/server/audio/SpatializerHelper.java @@ -709,8 +709,11 @@ public class SpatializerHelper { } private boolean isDeviceCompatibleWithSpatializationModes(@NonNull AudioDeviceAttributes ada) { + // modeForDevice will be neither transaural or binaural for devices that do not support + // spatial audio. For instance mono devices like earpiece, speaker safe or sco must + // not be included. final byte modeForDevice = (byte) SPAT_MODE_FOR_DEVICE_TYPE.get(ada.getType(), - /*default when type not found*/ SpatializationMode.SPATIALIZER_BINAURAL); + /*default when type not found*/ -1); if ((modeForDevice == SpatializationMode.SPATIALIZER_BINAURAL && mBinauralSupported) || (modeForDevice == SpatializationMode.SPATIALIZER_TRANSAURAL && mTransauralSupported)) { @@ -1532,8 +1535,8 @@ public class SpatializerHelper { @Override public String toString() { - return "type:" + mDeviceType + " addr:" + mDeviceAddress + " enabled:" + mEnabled - + " HT:" + mHasHeadTracker + " HTenabled:" + mHeadTrackerEnabled; + return "type: " + mDeviceType + " addr: " + mDeviceAddress + " enabled: " + mEnabled + + " HT: " + mHasHeadTracker + " HTenabled: " + mHeadTrackerEnabled; } String toPersistableString() { |