Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ee3c5d3 authored by Android Build Prod User's avatar Android Build Prod User Committed by Android (Google) Code Review
Browse files

Merge changes from topic "fix-b-188932434-common-types-2" 

* changes:
  Move common audio AIDL types to audio.media.audio.common
  Update MIME types in AidlConversion and MediaDefs
parents b57ca9b0 57bd06fe

media/libaaudio/src/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ cc_library { 
        "libbinder",

        "framework-permission-aidl-cpp",

        "aaudio-aidl-cpp",

        "android.media.audio.common.types-V1-cpp",

        "audioclient-types-aidl-cpp",

        "libaudioclient_aidl_conversion",

    ],
@@ -246,6 +247,7 @@ aidl_interface { 
        "binding/aidl/aaudio/IAAudioService.aidl",

    ],

    imports: [

        "android.media.audio.common.types",

        "audioclient-types-aidl",

        "shared-file-region-aidl",

        "framework-permission-aidl",

media/libaaudio/src/binding/AAudioStreamConfiguration.cpp

+3 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 


using namespace aaudio;



using android::media::AudioFormatDescription;

using android::media::audio::common::AudioFormatDescription;



AAudioStreamConfiguration::AAudioStreamConfiguration(const StreamParameters& parcelable) {

    setChannelMask(parcelable.channelMask);
@@ -76,7 +76,8 @@ StreamParameters AAudioStreamConfiguration::parcelable() const { 
        result.audioFormat = convAudioFormat.value();

    } else {

        result.audioFormat = AudioFormatDescription{};

        result.audioFormat.type = android::media::AudioFormatType::SYS_RESERVED_INVALID;

        result.audioFormat.type =

                android::media::audio::common::AudioFormatType::SYS_RESERVED_INVALID;

    }

    static_assert(sizeof(aaudio_direction_t) == sizeof(result.direction));

    result.direction = getDirection();

media/libaaudio/src/binding/aidl/aaudio/StreamParameters.aidl

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package aaudio;



import android.media.AudioFormatDescription;

import android.media.audio.common.AudioFormatDescription;



parcelable StreamParameters {

    int                                       channelMask;  //          = AAUDIO_UNSPECIFIED;

media/libaudioclient/AidlConversion.cpp

+107 −130

File changed.

Preview size limit exceeded, changes collapsed.

media/libaudioclient/Android.bp

+8 −4

File changed.

Preview size limit exceeded, changes collapsed.