audio: Support new and old mixer paths locations
Change-Id: Ifa2a55cbfe45ab9d53cd23098012443f9b32ca31
diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index bd15634..54ae924 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -539,10 +539,15 @@
}
} while (mixer == NULL);
- sprintf(mixer_path, "/system/etc/mixer_paths_%d.xml", card);
+ sprintf(mixer_path, "/vendor/etc/mixer_paths_%d.xml", card);
if (access(mixer_path, F_OK) == -1) {
- ALOGE("%s: Failed to load mixer paths from %s, your system is going to crash",
+ ALOGW("%s: Failed to open mixer paths from %s, retrying with legacy location",
__func__, mixer_path);
+ sprintf(mixer_path, "/system/etc/mixer_paths_%d.xml", card);
+ if (access(mixer_path, F_OK) == -1) {
+ ALOGE("%s: Failed to load a mixer paths configuration, your system will crash",
+ __func__);
+ }
}
audio_route = audio_route_init(card, mixer_path);