FIX:optimized AMS and EXT checks

jira:[STUDIO-11833]

Change-Id: I2c2756882897c878f2254a5c6fa8a31363af1bb0
(cherry picked from commit 32e3e8063653217987ec0dc5df4bad3468158490)
This commit is contained in:
tao wang 2025-05-06 16:24:37 +08:00 committed by Noisyfox
parent b965d420cf
commit 5f19b624f4

View file

@ -2387,7 +2387,7 @@ static bool _HasExt(const std::vector<FilamentInfo> &ams_mapping_result) {
};
for (const auto &info : ams_mapping_result) {
if (info.ams_id == VIRTUAL_AMS_MAIN_ID_STR || info.ams_id == VIRTUAL_AMS_DEPUTY_ID_STR) {
if (info.ams_id == VIRTUAL_AMS_MAIN_ID_STR || info.ams_id == VIRTUAL_AMS_DEPUTY_ID_STR && !info.ams_id.empty()) {
return true;
}
}
@ -2397,7 +2397,7 @@ static bool _HasExt(const std::vector<FilamentInfo> &ams_mapping_result) {
static bool _HasAms(const std::vector<FilamentInfo> &ams_mapping_result) {
for (const auto &info : ams_mapping_result) {
if (info.ams_id != VIRTUAL_AMS_MAIN_ID_STR && info.ams_id != VIRTUAL_AMS_DEPUTY_ID_STR) {
if (info.ams_id != VIRTUAL_AMS_MAIN_ID_STR && info.ams_id != VIRTUAL_AMS_DEPUTY_ID_STR && !info.ams_id.empty()) {
return true;
}
}