| commit | 4d24611479c263ffacfcf83123c37255ca35f903 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Jul 20 20:44:57 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 20 20:44:57 2023 +0000 |
| tree | 094a33dcd3439a2bec29367501a2a3cb26ae54af | |
| parent | fe62dcafe02b4830bdaa45b53b1a78c47094d7c2 [diff] | |
| parent | b72a3db88e9c32609089a3f939f9c0ed9cdc16d9 [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 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2658258 Change-Id: I23f0f5761b24ef185596b3e88885db4233084f08 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 a0ec9aa..fad89d9 100644 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -7741,6 +7741,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) {