From 6c962d35a8e4d73273fcce0618a988aac68ba13b Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Thu, 3 Nov 2022 17:48:22 +0900 Subject: [PATCH] universal7885: fm-aidl: Always sort the fetched track list --- .../apps/aidl-support/fm/default/FMDevControl.cpp | 2 ++ universal7885-common/apps/aidl-support/fm/default/FMSupport.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/universal7885-common/apps/aidl-support/fm/default/FMDevControl.cpp b/universal7885-common/apps/aidl-support/fm/default/FMDevControl.cpp index f3a00d4..45d311d 100644 --- a/universal7885-common/apps/aidl-support/fm/default/FMDevControl.cpp +++ b/universal7885-common/apps/aidl-support/fm/default/FMDevControl.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -140,6 +141,7 @@ namespace aidl::vendor::eureka::hardware::fmradio { search_thread = std::thread([this] { const std::lock_guard guard(lock); freqs_list = fm_radio_slsi::get_freqs(fd); + std::sort(freqs_list.begin(), freqs_list.end(), std::less()); }); search_thread.detach(); break; diff --git a/universal7885-common/apps/aidl-support/fm/default/FMSupport.cpp b/universal7885-common/apps/aidl-support/fm/default/FMSupport.cpp index e4f0509..e5d297e 100644 --- a/universal7885-common/apps/aidl-support/fm/default/FMSupport.cpp +++ b/universal7885-common/apps/aidl-support/fm/default/FMSupport.cpp @@ -109,6 +109,7 @@ constexpr const char *FM_FREQ_SEEK = FM_SYSFS_BASE "/radio_freq_seek"; if (std::find(freqs_list.begin(), freqs_list.end(), freq) != freqs_list.end()) continue; freqs_list.push_back(freq); } + std::sort(freqs_list.begin(), freqs_list.end(), std::less()); }); search_thread.detach(); break;