diff options
| author | 2021-01-06 19:00:32 +0000 | |
|---|---|---|
| committer | 2021-01-06 19:00:32 +0000 | |
| commit | ae9bf1e192f93b5ad259f7c13c5b72264d9c57a2 (patch) | |
| tree | d5ac6f1616cd54325da78bb4081ddbb1d90915da | |
| parent | 162b5e90f9760392cd881091cdbf9de4ea1eb889 (diff) | |
| parent | fae808ffc32c594b25f043c4205e742fdbaae818 (diff) | |
Merge "Revert^2 "Added update device info playback configuration""
| -rw-r--r-- | include/audiomanager/AudioManager.h | 1 | ||||
| -rw-r--r-- | include/audiomanager/IAudioManager.h | 3 | ||||
| -rw-r--r-- | services/audiomanager/IAudioManager.cpp | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/include/audiomanager/AudioManager.h b/include/audiomanager/AudioManager.h index 639df7a531..4aa2f60d45 100644 --- a/include/audiomanager/AudioManager.h +++ b/include/audiomanager/AudioManager.h @@ -37,6 +37,7 @@ typedef enum { PLAYER_STATE_STARTED = 2, PLAYER_STATE_PAUSED = 3, PLAYER_STATE_STOPPED = 4, + PLAYER_UPDATE_DEVICE_ID = 5, } player_state_t; // must be kept in sync with definitions in AudioManager.java diff --git a/include/audiomanager/IAudioManager.h b/include/audiomanager/IAudioManager.h index 2f5ccb89e9..7d1f38fb33 100644 --- a/include/audiomanager/IAudioManager.h +++ b/include/audiomanager/IAudioManager.h @@ -49,7 +49,8 @@ public: audio_content_type_t content, const sp<IBinder>& player) = 0; /*oneway*/ virtual status_t playerAttributes(audio_unique_id_t piid, audio_usage_t usage, audio_content_type_t content)= 0; - /*oneway*/ virtual status_t playerEvent(audio_unique_id_t piid, player_state_t event) = 0; + /*oneway*/ virtual status_t playerEvent(audio_unique_id_t piid, player_state_t event, + audio_port_handle_t deviceId) = 0; /*oneway*/ virtual status_t releasePlayer(audio_unique_id_t piid) = 0; virtual audio_unique_id_t trackRecorder(const sp<IBinder>& recorder) = 0; /*oneway*/ virtual status_t recorderEvent(audio_unique_id_t riid, recorder_state_t event) = 0; diff --git a/services/audiomanager/IAudioManager.cpp b/services/audiomanager/IAudioManager.cpp index 6235f06bc1..0d1726508b 100644 --- a/services/audiomanager/IAudioManager.cpp +++ b/services/audiomanager/IAudioManager.cpp @@ -84,11 +84,13 @@ public: return remote()->transact(PLAYER_ATTRIBUTES, data, &reply, IBinder::FLAG_ONEWAY); } - virtual status_t playerEvent(audio_unique_id_t piid, player_state_t event) { + virtual status_t playerEvent(audio_unique_id_t piid, player_state_t event, + audio_port_handle_t deviceId) { Parcel data, reply; data.writeInterfaceToken(IAudioManager::getInterfaceDescriptor()); data.writeInt32((int32_t) piid); data.writeInt32((int32_t) event); + data.writeInt32((int32_t) deviceId); return remote()->transact(PLAYER_EVENT, data, &reply, IBinder::FLAG_ONEWAY); } |