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

Commit 515fe146 authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

Merge "audio policy service: fix audioserver port cb upon APS crash" into pi-dev 

am: 2db457b3

Change-Id: Ib856872a87206c42ccd60745e904ec92db6a5f68
parents 38ca1a3c 2db457b3

media/libaudioclient/AudioSystem.cpp

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

#include <binder/IServiceManager.h>

#include <binder/ProcessState.h>

#include <binder/IPCThreadState.h>

#include <media/AudioResamplerPublic.h>

#include <media/AudioSystem.h>

#include <media/IAudioFlinger.h>
@@ -75,7 +76,9 @@ const sp<IAudioFlinger> AudioSystem::get_audio_flinger() 
        af = gAudioFlinger;

    }

    if (afc != 0) {

        int64_t token = IPCThreadState::self()->clearCallingIdentity();

        af->registerClient(afc);

        IPCThreadState::self()->restoreCallingIdentity(token);

    }

    return af;

}
@@ -767,7 +770,10 @@ const sp<IAudioPolicyService> AudioSystem::get_audio_policy_service() 
        ap = gAudioPolicyService;

    }

    if (apc != 0) {

        int64_t token = IPCThreadState::self()->clearCallingIdentity();

        ap->registerClient(apc);

        ap->setAudioPortCallbacksEnabled(apc->isAudioPortCbEnabled());

        IPCThreadState::self()->restoreCallingIdentity(token);

    }



    return ap;

media/libaudioclient/include/media/AudioSystem.h

+1 −0
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ private: 


        int addAudioPortCallback(const sp<AudioPortCallback>& callback);

        int removeAudioPortCallback(const sp<AudioPortCallback>& callback);

        bool isAudioPortCbEnabled() const { return (mAudioPortCallbacks.size() != 0); }



        // DeathRecipient

        virtual void binderDied(const wp<IBinder>& who);