Skip to content

Commit ff7a0f4

Browse files
robertwu1Android (Google) Code Review
authored andcommitted
Merge "Use a vector of devices in IAudioManager" into main
2 parents f03ef88 + 4fcdbe7 commit ff7a0f4

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

include/audiomanager/IAudioManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class IAudioManager : public IInterface
5656
/*oneway*/ virtual status_t playerAttributes(audio_unique_id_t piid, audio_usage_t usage,
5757
audio_content_type_t content)= 0;
5858
/*oneway*/ virtual status_t playerEvent(audio_unique_id_t piid, player_state_t event,
59-
audio_port_handle_t eventId) = 0;
59+
const std::vector<audio_port_handle_t>& eventIds) = 0;
6060
/*oneway*/ virtual status_t releasePlayer(audio_unique_id_t piid) = 0;
6161
virtual audio_unique_id_t trackRecorder(const sp<IBinder>& recorder) = 0;
6262
/*oneway*/ virtual status_t recorderEvent(audio_unique_id_t riid, recorder_state_t event) = 0;

services/audiomanager/IAudioManager.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,15 @@ class BpAudioManager : public BpInterface<IAudioManager>
8787
}
8888

8989
virtual status_t playerEvent(audio_unique_id_t piid, player_state_t event,
90-
audio_port_handle_t eventId) {
90+
const std::vector<audio_port_handle_t>& eventIds) {
9191
Parcel data, reply;
9292
data.writeInterfaceToken(IAudioManager::getInterfaceDescriptor());
9393
data.writeInt32((int32_t) piid);
9494
data.writeInt32((int32_t) event);
95-
data.writeInt32((int32_t) eventId);
95+
data.writeInt32((int32_t) eventIds.size());
96+
for (auto eventId: eventIds) {
97+
data.writeInt32((int32_t) eventId);
98+
}
9699
return remote()->transact(PLAYER_EVENT, data, &reply, IBinder::FLAG_ONEWAY);
97100
}
98101

0 commit comments

Comments
 (0)