diff options
| author | 2020-12-22 00:51:59 +0000 | |
|---|---|---|
| committer | 2020-12-22 00:51:59 +0000 | |
| commit | d0ab5db490260a696021e069385ac5035bee1f5f (patch) | |
| tree | acc5a11109111dd9f3438fd965c8fa494520abb5 | |
| parent | fc28648fd6d344516a0f2bdbbf662bbbd2e4fcb2 (diff) | |
Revert "Added update device info playback configuration"
Revert "Added audio playback configuration CTS test"
Revert submission 13138779-device_id_push_work
Reason for revert: Breaking device tests, see b/176043355
Reverted Changes:
I859d33a4a:Added update device info playback configuration
Icbd1d430b:Added audio playback configuration CTS test
I4a8409d95:Added device info playback config for Open SL ES
I365bafc95:Added update device info playback configuration
I802269fea:Added device info playback config for native playe...
Change-Id: I581374aaa8a91d42c1d147f96e22cb0d3ddf2875
| -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, 2 insertions, 6 deletions
diff --git a/include/audiomanager/AudioManager.h b/include/audiomanager/AudioManager.h index 4aa2f60d45..639df7a531 100644 --- a/include/audiomanager/AudioManager.h +++ b/include/audiomanager/AudioManager.h @@ -37,7 +37,6 @@ 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 7d1f38fb33..2f5ccb89e9 100644 --- a/include/audiomanager/IAudioManager.h +++ b/include/audiomanager/IAudioManager.h @@ -49,8 +49,7 @@ 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, - audio_port_handle_t deviceId) = 0; + /*oneway*/ virtual status_t playerEvent(audio_unique_id_t piid, player_state_t event) = 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 0d1726508b..6235f06bc1 100644 --- a/services/audiomanager/IAudioManager.cpp +++ b/services/audiomanager/IAudioManager.cpp @@ -84,13 +84,11 @@ public: return remote()->transact(PLAYER_ATTRIBUTES, data, &reply, IBinder::FLAG_ONEWAY); } - virtual status_t playerEvent(audio_unique_id_t piid, player_state_t event, - audio_port_handle_t deviceId) { + virtual status_t playerEvent(audio_unique_id_t piid, player_state_t event) { 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); } |