audio: Support new and old mixer paths locations

Change-Id: Ifa2a55cbfe45ab9d53cd23098012443f9b32ca31
tirimbino
Christopher N. Hesse 7 years ago
parent 2beff4222c
commit d8d04fd497
  1. 9
      audio/audio_hw.c

@ -539,10 +539,15 @@ static int mixer_init(struct audio_device *adev)
} }
} while (mixer == NULL); } 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) { 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); __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); audio_route = audio_route_init(card, mixer_path);

Loading…
Cancel
Save