| commit | 14434bf862294b908fbccc89e2c9ef6ff783bda8 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Jul 20 21:29:51 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 20 21:29:51 2023 +0000 |
| tree | 279ca3dec12170bbb4de517dcd3302f5c774355d | |
| parent | 7529da763cc282c9434c7d0bd94cddb85726f5d0 [diff] | |
| parent | 4d24611479c263ffacfcf83123c37255ca35f903 [diff] |
Merge "audio: if device is change from none to new device, need get index from new device." into main am: 0cf7ca884c am: 039936c858 am: b72a3db88e am: 4d24611479 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2658258 Change-Id: I6cce0f52d1694b23cade69c7689a7a98440a1ad5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp index 47830d0..8e8fc0a 100644 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -7822,6 +7822,9 @@ } if (deviceTypes.empty()) { deviceTypes = outputDesc->devices().types(); + index = curves.getVolumeIndex(deviceTypes); + ALOGD("%s if deviceTypes is change from none to device %s, need get index %d", + __func__, dumpDeviceTypes(deviceTypes).c_str(), index); } if (curves.getVolumeIndexMin() < 0 || curves.getVolumeIndexMax() < 0) {