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

Commit ba9053b4 authored by Jaideep Sharma's avatar Jaideep Sharma Committed by Mikhail Naganov
Browse files

audiopolicy: add support to load custom audiopolicymanager. 

This change provides a mechanism to load a custom implementation of
AudioPolicyManager.
If custom library is present load that otherwise fallback to default
AudioPolicyManager.

This custom implementation should reside under system_ext or product
partition and should be compliant to xTS test suites.

- To use this create a library viz. libaudiopolicymanagericustom.so by
  extending AudioPolicyManager in system_ext or product partition,
  expose createAudioPolicyManager & destroyAudioPolicyManager methods
  to return custom AudioPolicyManager instance.

Bug: 120198776
Test: make

Change-Id: I0df7c390fe29f56378d4b90ca5ab559302770419
parent 1570f85e

services/audiopolicy/AudioPolicyInterface.h

+5 −3
Original line number Diff line number Diff line
@@ -450,9 +450,11 @@ public: 
    virtual status_t getAudioPort(struct audio_port_v7 *port) = 0;

};



extern "C" AudioPolicyInterface* createAudioPolicyManager(AudioPolicyClientInterface *clientInterface);

extern "C" void destroyAudioPolicyManager(AudioPolicyInterface *interface);



    // These are the signatures of createAudioPolicyManager/destroyAudioPolicyManager

    // methods respectively, expected by AudioPolicyService, needs to be exposed by

    // libaudiopolicymanagercustom.

    using CreateAudioPolicyManagerInstance = AudioPolicyInterface* (*)(AudioPolicyClientInterface*);

    using DestroyAudioPolicyManagerInstance = void (*)(AudioPolicyInterface*);



} // namespace android

services/audiopolicy/manager/Android.bp

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
cc_library_shared {

    name: "libaudiopolicymanager",



    srcs: [

        "AudioPolicyFactory.cpp",

    ],



    include_dirs: [

        "frameworks/av/services/audioflinger"

    ],



    shared_libs: [

        "libaudiopolicymanagerdefault",

    ],



    static_libs: [

        "libaudiopolicycomponents",

    ],



    header_libs: [

        "libaudiopolicycommon",

        "libaudiopolicyengine_interface_headers",

        "libaudiopolicymanager_interface_headers",

        "libaudioutils_headers",

    ],



    cflags: [

        "-Werror",

        "-Wall",

    ],



}

services/audiopolicy/manager/AudioPolicyFactory.cpp

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <AudioPolicyManager.h>



namespace android {



extern "C" AudioPolicyInterface* createAudioPolicyManager(

        AudioPolicyClientInterface *clientInterface)

{

    AudioPolicyManager *apm = new AudioPolicyManager(clientInterface);

    status_t status = apm->initialize();

    if (status != NO_ERROR) {

        delete apm;

        apm = nullptr;

    }

    return apm;

}



extern "C" void destroyAudioPolicyManager(AudioPolicyInterface *interface)

{

    delete interface;

}



} // namespace android

services/audiopolicy/service/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ cc_library_shared { 
        "libaudioclient_aidl_conversion",

        "libaudiofoundation",

        "libaudiopolicy",

        "libaudiopolicymanager",

        "libaudiopolicymanagerdefault",

        "libaudioutils",

        "libbinder",

        "libcutils",

services/audiopolicy/service/AudioPolicyService.cpp

+63 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#define __STDC_LIMIT_MACROS

#include <stdint.h>

#include <sys/time.h>

#include <dlfcn.h>



#include <audio_utils/clock.h>

#include <binder/IServiceManager.h>
@@ -44,12 +45,14 @@ 


#include <system/audio.h>

#include <system/audio_policy.h>

#include <AudioPolicyManager.h>



namespace android {

using binder::Status;



static const char kDeadlockedString[] = "AudioPolicyService may be deadlocked\n";

static const char kCmdDeadlockedString[] = "AudioPolicyService command thread may be deadlocked\n";

static const char kAudioPolicyManagerCustomPath[] = "libaudiopolicymanagercustom.so";



static const int kDumpLockTimeoutNs = 1 * NANOS_PER_SECOND;
@@ -59,12 +62,54 @@ static const String16 sManageAudioPolicyPermission("android.permission.MANAGE_AU 


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



static AudioPolicyInterface* createAudioPolicyManager(AudioPolicyClientInterface *clientInterface)

{

    AudioPolicyManager *apm = new AudioPolicyManager(clientInterface);

    status_t status = apm->initialize();

    if (status != NO_ERROR) {

        delete apm;

        apm = nullptr;

    }

    return apm;

}



static void destroyAudioPolicyManager(AudioPolicyInterface *interface)

{

    delete interface;

}

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



AudioPolicyService::AudioPolicyService()

    : BnAudioPolicyService(),

      mAudioPolicyManager(NULL),

      mAudioPolicyClient(NULL),

      mPhoneState(AUDIO_MODE_INVALID),

      mCaptureStateNotifier(false) {

      mCaptureStateNotifier(false),

      mCreateAudioPolicyManager(createAudioPolicyManager),

      mDestroyAudioPolicyManager(destroyAudioPolicyManager) {

}



void AudioPolicyService::loadAudioPolicyManager()

{

    mLibraryHandle = dlopen(kAudioPolicyManagerCustomPath, RTLD_NOW);

    if (mLibraryHandle != nullptr) {

        ALOGI("%s loading %s", __func__, kAudioPolicyManagerCustomPath);

        mCreateAudioPolicyManager = reinterpret_cast<CreateAudioPolicyManagerInstance>

                                            (dlsym(mLibraryHandle, "createAudioPolicyManager"));

        const char *lastError = dlerror();

        ALOGW_IF(mCreateAudioPolicyManager == nullptr, "%s createAudioPolicyManager is null %s",

                    __func__, lastError != nullptr ? lastError : "no error");



        mDestroyAudioPolicyManager = reinterpret_cast<DestroyAudioPolicyManagerInstance>(

                                        dlsym(mLibraryHandle, "destroyAudioPolicyManager"));

        lastError = dlerror();

        ALOGW_IF(mDestroyAudioPolicyManager == nullptr, "%s destroyAudioPolicyManager is null %s",

                    __func__, lastError != nullptr ? lastError : "no error");

        if (mCreateAudioPolicyManager == nullptr || mDestroyAudioPolicyManager == nullptr){

            unloadAudioPolicyManager();

            LOG_ALWAYS_FATAL("could not find audiopolicymanager interface methods");

        }

    }

}



void AudioPolicyService::onFirstRef()
@@ -78,7 +123,9 @@ void AudioPolicyService::onFirstRef() 
        mOutputCommandThread = new AudioCommandThread(String8("ApmOutput"), this);



        mAudioPolicyClient = new AudioPolicyClient(this);

        mAudioPolicyManager = createAudioPolicyManager(mAudioPolicyClient);



        loadAudioPolicyManager();

        mAudioPolicyManager = mCreateAudioPolicyManager(mAudioPolicyClient);

    }

    // load audio processing modules

    sp<AudioPolicyEffects> audioPolicyEffects = new AudioPolicyEffects();
@@ -94,12 +141,25 @@ void AudioPolicyService::onFirstRef() 
    sensorPrivacyPolicy->registerSelf();

}



void AudioPolicyService::unloadAudioPolicyManager()

{

    ALOGV("%s ", __func__);

    if (mLibraryHandle != nullptr) {

        dlclose(mLibraryHandle);

    }

    mLibraryHandle = nullptr;

    mCreateAudioPolicyManager = nullptr;

    mDestroyAudioPolicyManager = nullptr;

}



AudioPolicyService::~AudioPolicyService()

{

    mAudioCommandThread->exit();

    mOutputCommandThread->exit();



    destroyAudioPolicyManager(mAudioPolicyManager);

    mDestroyAudioPolicyManager(mAudioPolicyManager);

    unloadAudioPolicyManager();



    delete mAudioPolicyClient;



    mNotificationClients.clear();