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

Commit 8f7242b6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "mvAudioDeviceTypeAddr" 

* changes:
  Use AudioDeviceTypeAddr in DeviceDescriptorBase.
  Move AudioDeviceTypeAddr to libaudiofoundation.
parents b8f41f2f 5d51ca95

media/libaudioclient/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ cc_library_shared { 
        "AudioVolumeGroup.cpp",

    ],

    shared_libs: [

        "libaudiofoundation",

        "libaudioutils",

        "libbinder",

        "libcutils",

media/libaudioclient/AudioPolicy.cpp

+0 −16
Original line number Diff line number Diff line
@@ -21,22 +21,6 @@ 


namespace android {



//

//  AudioDeviceTypeAddr implementation

//

status_t AudioDeviceTypeAddr::readFromParcel(Parcel *parcel) {

    mType = (audio_devices_t) parcel->readInt32();

    mAddress = parcel->readString8();

    return NO_ERROR;

}



status_t AudioDeviceTypeAddr::writeToParcel(Parcel *parcel) const {

    parcel->writeInt32((int32_t) mType);

    parcel->writeString8(mAddress);

    return NO_ERROR;

}





//

//  AudioMixMatchCriterion implementation

//

media/libaudioclient/include/media/AudioPolicy.h

+2 −14
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ 
#ifndef ANDROID_AUDIO_POLICY_H

#define ANDROID_AUDIO_POLICY_H



#include <binder/Parcel.h>

#include <media/AudioDeviceTypeAddr.h>

#include <system/audio.h>

#include <system/audio_policy.h>

#include <binder/Parcel.h>

#include <utils/String8.h>

#include <utils/Vector.h>
@@ -60,19 +61,6 @@ namespace android { 
#define MAX_MIXES_PER_POLICY 10

#define MAX_CRITERIA_PER_MIX 20



class AudioDeviceTypeAddr {

public:

    AudioDeviceTypeAddr() {}

    AudioDeviceTypeAddr(audio_devices_t type, String8 address) :

        mType(type), mAddress(address) {}



    status_t readFromParcel(Parcel *parcel);

    status_t writeToParcel(Parcel *parcel) const;



    audio_devices_t mType;

    String8 mAddress;

};



class AudioMixMatchCriterion {

public:

    AudioMixMatchCriterion() {}

media/libaudioclient/include/media/AudioSystem.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <sys/types.h>



#include <media/AudioDeviceTypeAddr.h>

#include <media/AudioPolicy.h>

#include <media/AudioProductStrategy.h>

#include <media/AudioVolumeGroup.h>

media/libaudioclient/include/media/IAudioPolicyService.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <utils/RefBase.h>

#include <utils/Errors.h>

#include <binder/IInterface.h>

#include <media/AudioDeviceTypeAddr.h>

#include <media/AudioSystem.h>

#include <media/AudioPolicy.h>

#include <media/IAudioPolicyServiceClient.h>