gemian/pulseaudio-modules-droid
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #94 from mer-hybris/jb48080

Browse source 
common: Add missing configuration file search locations.
This commit is contained in:
Juho Hämäläinen 2019-11-11 09:58:09 +02:00 • committed by GitHub
commit 9363d97953
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
README
View file

@ -80,10 +80,12 @@ and source) can be used to point to the configuration file location.
By default files are tried in following order,
/vendor/etc/audio_policy_configuration.xml (new xml format)
/vendor/etc/audio_policy.conf (legacy format)
/system/etc/audio_policy_configuration.xml (new xml format)
/system/etc/audio_policy.conf (legacy format)
/odm/etc/audio_policy_configuration.xml (new xml format)
/vendor/etc/audio/audio_policy_configuration.xml (new xml format)
/vendor/etc/audio_policy_configuration.xml (new xml format)
/vendor/etc/audio_policy.conf (legacy format)
/system/etc/audio_policy_configuration.xml (new xml format)
/system/etc/audio_policy.conf (legacy format)
module-droid-card
-----------------

4
src/common/droid-config.c
View file

@ -66,6 +66,8 @@
#include <hardware/audio.h>
#include <hardware_legacy/audio_policy_conf.h>
#define ODM_AUDIO_POLICY_CONFIG_XML_FILE "/odm/etc/audio_policy_configuration.xml"
#define VENDOR_AUDIO_AUDIO_POLICY_CONFIG_XML_FILE "/vendor/etc/audio/audio_policy_configuration.xml"
#define VENDOR_AUDIO_POLICY_CONFIG_XML_FILE "/vendor/etc/audio_policy_configuration.xml"
#define SYSTEM_AUDIO_POLICY_CONFIG_XML_FILE "/system/etc/audio_policy_configuration.xml"
@ -74,6 +76,8 @@ pa_droid_config_audio *pa_droid_config_load(pa_modargs *ma) {
pa_droid_config_audio *config = NULL;
const char *manual_config;
const char *config_location[] = {
ODM_AUDIO_POLICY_CONFIG_XML_FILE,
VENDOR_AUDIO_AUDIO_POLICY_CONFIG_XML_FILE,
VENDOR_AUDIO_POLICY_CONFIG_XML_FILE,
AUDIO_POLICY_VENDOR_CONFIG_FILE,
SYSTEM_AUDIO_POLICY_CONFIG_XML_FILE,