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
diff --git a/services/audiopolicy/AudioPolicyInterface.h b/services/audiopolicy/AudioPolicyInterface.h
index 630c423..7c0f2ce 100644
--- a/services/audiopolicy/AudioPolicyInterface.h
+++ b/services/audiopolicy/AudioPolicyInterface.h
@@ -450,9 +450,11 @@
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
diff --git a/services/audiopolicy/manager/Android.bp b/services/audiopolicy/manager/Android.bp
deleted file mode 100644
index 5bb432f..0000000
--- a/services/audiopolicy/manager/Android.bp
+++ /dev/null
@@ -1,32 +0,0 @@
-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",
- ],
-
-}
diff --git a/services/audiopolicy/manager/AudioPolicyFactory.cpp b/services/audiopolicy/manager/AudioPolicyFactory.cpp
deleted file mode 100644
index 476a1ec..0000000
--- a/services/audiopolicy/manager/AudioPolicyFactory.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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
diff --git a/services/audiopolicy/service/Android.bp b/services/audiopolicy/service/Android.bp
index 8cb1b59..8186da9 100644
--- a/services/audiopolicy/service/Android.bp
+++ b/services/audiopolicy/service/Android.bp
@@ -18,7 +18,7 @@
"libaudioclient_aidl_conversion",
"libaudiofoundation",
"libaudiopolicy",
- "libaudiopolicymanager",
+ "libaudiopolicymanagerdefault",
"libaudioutils",
"libbinder",
"libcutils",
diff --git a/services/audiopolicy/service/AudioPolicyService.cpp b/services/audiopolicy/service/AudioPolicyService.cpp
index 12335d9..90ad81e 100644
--- a/services/audiopolicy/service/AudioPolicyService.cpp
+++ b/services/audiopolicy/service/AudioPolicyService.cpp
@@ -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 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 @@
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 @@
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();
diff --git a/services/audiopolicy/service/AudioPolicyService.h b/services/audiopolicy/service/AudioPolicyService.h
index 72d8f28..e25d542 100644
--- a/services/audiopolicy/service/AudioPolicyService.h
+++ b/services/audiopolicy/service/AudioPolicyService.h
@@ -38,7 +38,6 @@
#include "CaptureStateNotifier.h"
#include <AudioPolicyInterface.h>
#include <android/hardware/BnSensorPrivacyListener.h>
-
#include <unordered_map>
namespace android {
@@ -861,7 +860,8 @@
// Internal dump utilities.
status_t dumpPermissionDenial(int fd);
-
+ void loadAudioPolicyManager();
+ void unloadAudioPolicyManager();
mutable Mutex mLock; // prevents concurrent access to AudioPolicy manager functions changing
// device connection state or routing
@@ -896,6 +896,10 @@
CaptureStateNotifier mCaptureStateNotifier;
+ void *mLibraryHandle = nullptr;
+ CreateAudioPolicyManagerInstance mCreateAudioPolicyManager;
+ DestroyAudioPolicyManagerInstance mDestroyAudioPolicyManager;
+
std::map<userid_t, sp<SensorPrivacyPolicy>> mMicrophoneSensorPrivacyPolicies;
};