commit dac3abf95480cdb5e5af520e05e7b674d7ab7b96
author Ajender Reddy <quic_ajender@quicinc.com> Wed Dec 04 17:21:46 2024 +0530
committer Ajender Reddy <quic_ajender@quicinc.com> Thu Dec 05 17:10:39 2024 +0530
tree 9830b96c3080ee26884999f3d9dea46764b04f92
parent b2b0ce9512b7159ecf3e8a70e705b43d78b5846a

audio: update setAudioPatch

avoid duplicate updates from setAudioPatch

Bug: 382421476

Test: m

Change-Id: I1e871b40fd0f75fffc1a835831faedbd4cb3801d

audio/aidl/default/Module.cpp

diff --git a/audio/aidl/default/Module.cpp b/audio/aidl/default/Module.cpp
index e96cf81..2be7f51 100644
--- a/audio/aidl/default/Module.cpp
+++ b/audio/aidl/default/Module.cpp
@@ -1049,6 +1049,23 @@
         return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
     }
 
+    auto& patches = getConfig().patches;
+    auto existing = patches.end();
+    if (in_requested.id != 0) {
+        existing = findById<AudioPatch>(patches, in_requested.id);
+        if (existing == patches.end()) {
+            LOG(ERROR) << __func__ << ": " << mType << ": not found existing patch id "
+                       << in_requested.id;
+            return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
+        }
+        if (in_requested == *existing) {
+            LOG(INFO) << __func__ << ": " << mType
+                      << ": requested patch has no changes compared to already existing one, id "
+                      << in_requested.id;
+            return ndk::ScopedAStatus::ok();
+        }
+    }
+
     auto& configs = getConfig().portConfigs;
     std::vector<int32_t> missingIds;
     auto sources =
@@ -1088,20 +1105,12 @@
     }
     RETURN_STATUS_IF_ERROR(checkAudioPatchEndpointsMatch(sources, sinks));
 
-    auto& patches = getConfig().patches;
-    auto existing = patches.end();
     std::optional<decltype(mPatches)> patchesBackup;
-    if (in_requested.id != 0) {
-        existing = findById<AudioPatch>(patches, in_requested.id);
-        if (existing != patches.end()) {
-            patchesBackup = mPatches;
-            cleanUpPatch(existing->id);
-        } else {
-            LOG(ERROR) << __func__ << ": " << mType << ": not found existing patch id "
-                       << in_requested.id;
-            return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
-        }
+    if (existing != patches.end()) {
+        patchesBackup = mPatches;
+        cleanUpPatch(existing->id);
     }
+
     // Validate the requested patch.
     for (const auto& [sinkPortId, nonExclusive] : allowedSinkPorts) {
         if (!nonExclusive && mPatches.count(sinkPortId) != 0) {