diff options
4 files changed, 9 insertions, 7 deletions
diff --git a/media/aidl/android/media/audio/common/AudioPort.aidl b/media/aidl/android/media/audio/common/AudioPort.aidl index 8e1c5afe3fe3..84675e3a00a6 100644 --- a/media/aidl/android/media/audio/common/AudioPort.aidl +++ b/media/aidl/android/media/audio/common/AudioPort.aidl @@ -18,7 +18,6 @@ package android.media.audio.common; import android.media.audio.common.AudioGain; import android.media.audio.common.AudioIoFlags; -import android.media.audio.common.AudioPortConfig; import android.media.audio.common.AudioPortExt; import android.media.audio.common.AudioProfile; import android.media.audio.common.ExtraAudioDescriptor; @@ -33,7 +32,7 @@ import android.media.audio.common.ExtraAudioDescriptor; @VintfStability parcelable AudioPort { /** - * Unique identifier of the port within this HAL service. + * Unique identifier of the port within a HAL module. */ int id; /** @@ -57,8 +56,6 @@ parcelable AudioPort { ExtraAudioDescriptor[] extraAudioDescriptors; /** Gain controllers. */ AudioGain[] gains; - /** Current audio port configuration. */ - AudioPortConfig activeConfig; /** Extra parameters depending on the port role. */ AudioPortExt ext; } diff --git a/media/aidl/android/media/audio/common/AudioPortConfig.aidl b/media/aidl/android/media/audio/common/AudioPortConfig.aidl index e3a9374822d2..2702b147e7f4 100644 --- a/media/aidl/android/media/audio/common/AudioPortConfig.aidl +++ b/media/aidl/android/media/audio/common/AudioPortConfig.aidl @@ -33,10 +33,15 @@ import android.media.audio.common.Int; @VintfStability parcelable AudioPortConfig { /** - * Port unique ID. This field is set to a non-zero value when it is needed - * to select a previously reported port and apply new configuration to it. + * Port config unique ID. This field is set to a non-zero value when it is + * needed to select a previously reported port config and apply new + * configuration to it. */ int id; + /** + * The ID of the AudioPort instance this configuration applies to. + */ + int portId; /** Sample rate in Hz. Can be left unspecified. */ @nullable Int sampleRate; /** Channel mask. Can be left unspecified. */ diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPort.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPort.aidl index 8f563b3b2894..970bbc06890f 100644 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPort.aidl +++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPort.aidl @@ -41,6 +41,5 @@ parcelable AudioPort { android.media.audio.common.AudioIoFlags flags; android.media.audio.common.ExtraAudioDescriptor[] extraAudioDescriptors; android.media.audio.common.AudioGain[] gains; - android.media.audio.common.AudioPortConfig activeConfig; android.media.audio.common.AudioPortExt ext; } diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortConfig.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortConfig.aidl index 78967b43961c..18e6406117dc 100644 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortConfig.aidl +++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortConfig.aidl @@ -36,6 +36,7 @@ package android.media.audio.common; @JavaDerive(equals=true, toString=true) @VintfStability parcelable AudioPortConfig { int id; + int portId; @nullable android.media.audio.common.Int sampleRate; @nullable android.media.audio.common.AudioChannelLayout channelMask; @nullable android.media.audio.common.AudioFormatDescription format; |