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

Commit 7e54397b authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Bug 3366668 Use BinderService template"

parents 0a0930f2 3515a335

services/audioflinger/AudioPolicyService.cpp

+0 −7
Original line number Diff line number Diff line
@@ -487,13 +487,6 @@ status_t AudioPolicyService::onTransact( 
}





// ----------------------------------------------------------------------------

void AudioPolicyService::instantiate() {

    defaultServiceManager()->addService(

            String16("media.audio_policy"), new AudioPolicyService());

}





// ----------------------------------------------------------------------------

// AudioPolicyClientInterface implementation

// ----------------------------------------------------------------------------

services/audioflinger/AudioPolicyService.h

+8 −10
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <hardware_legacy/AudioPolicyInterface.h>

#include <media/ToneGenerator.h>

#include <utils/Vector.h>

#include <binder/BinderService.h>



namespace android {
@@ -28,12 +29,17 @@ class String8; 


// ----------------------------------------------------------------------------



class AudioPolicyService: public BnAudioPolicyService, public AudioPolicyClientInterface,

class AudioPolicyService :

    public BinderService<AudioPolicyService>,

    public BnAudioPolicyService,

    public AudioPolicyClientInterface,

    public IBinder::DeathRecipient

{

    friend class BinderService<AudioPolicyService>;



public:

    static  void        instantiate();

    // for BinderService

    static const char *getServiceName() { return "media.audio_policy"; }



    virtual status_t    dump(int fd, const Vector<String16>& args);
@@ -241,11 +247,3 @@ private: 
}; // namespace android



#endif // ANDROID_AUDIOPOLICYSERVICE_H