Revert "dynamic_sensor: Add sensor manager init to sub-HAL 2.1." am: 1d509cf815 am: fb74ed236c
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15886139
Change-Id: I774582c61e10555535317eb679b9d731b2ebea25
diff --git a/modules/usbaudio/audio_hal.c b/modules/usbaudio/audio_hal.c
index 39c0fb5..fe921d6 100644
--- a/modules/usbaudio/audio_hal.c
+++ b/modules/usbaudio/audio_hal.c
@@ -460,6 +460,41 @@
return num_sample_rates;
}
+static bool are_all_devices_found(unsigned int num_devices_to_find,
+ const int cards_to_find[],
+ const int devices_to_find[],
+ unsigned int num_devices,
+ const int cards[],
+ const int devices[]) {
+ for (unsigned int i = 0; i < num_devices_to_find; ++i) {
+ unsigned int j = 0;
+ for (; j < num_devices; ++j) {
+ if (cards_to_find[i] == cards[j] && devices_to_find[i] == devices[j]) {
+ break;
+ }
+ }
+ if (j >= num_devices) {
+ return false;
+ }
+ }
+ return true;
+}
+
+static bool are_devices_the_same(unsigned int left_num_devices,
+ const int left_cards[],
+ const int left_devices[],
+ unsigned int right_num_devices,
+ const int right_cards[],
+ const int right_devices[]) {
+ if (left_num_devices != right_num_devices) {
+ return false;
+ }
+ return are_all_devices_found(left_num_devices, left_cards, left_devices,
+ right_num_devices, right_cards, right_devices) &&
+ are_all_devices_found(right_num_devices, right_cards, right_devices,
+ left_num_devices, left_cards, left_devices);
+}
+
/*
* HAl Functions
*/
@@ -548,10 +583,11 @@
list_for_each(node, alsa_devices) {
struct alsa_device_info *device_info =
node_to_item(node, struct alsa_device_info, list_node);
- dprintf(fd, "Output Profile %zu:\n", i);
+ const char* direction = device_info->profile.direction == PCM_OUT ? "Output" : "Input";
+ dprintf(fd, "%s Profile %zu:\n", direction, i);
profile_dump(&device_info->profile, fd);
- dprintf(fd, "Output Proxy %zu:\n", i);
+ dprintf(fd, "%s Proxy %zu:\n", direction, i);
proxy_dump(&device_info->proxy, fd);
}
}
@@ -1648,6 +1684,13 @@
saved_devices[num_saved_devices++] = device_info->profile.device;
}
+ if (are_devices_the_same(
+ num_configs, cards, devices, num_saved_devices, saved_cards, saved_devices)) {
+ // The new devices are the same as original ones. No need to update.
+ stream_unlock(lock);
+ return 0;
+ }
+
device_lock(adev);
stream_standby_l(alsa_devices, out == NULL ? &in->standby : &out->standby);
device_unlock(adev);