commit 01d07f4d33064ada6f01d841c860ff5442c042a3
author Ram Mohan <ram.mohan@ittiam.com> Tue Feb 07 14:49:15 2023 +0530
committer Ram Mohan <ram.mohan@ittiam.com> Tue Feb 07 15:16:35 2023 +0530
tree 90404afd36a41416a90920da709b27ed418670a1
parent 72d6d8ecee940573f4844b4bb552ddfb55e509f6

Remove multiple calls to removeAudioDeviceCallback()

A call to stop() is already calling removeAudioDeviceCallback().
Further calls to the same is not needed

Bug: 267788926
Test: atest audiosystem_tests audiorouting_tests

Change-Id: Ib9fa1a786ad31008f44a80e3ae61e13eb01d854c

media/libaudioclient/tests/audiorouting_tests.cpp

diff --git a/media/libaudioclient/tests/audiorouting_tests.cpp b/media/libaudioclient/tests/audiorouting_tests.cpp
index 2c5fcd7..19d1abc 100644
--- a/media/libaudioclient/tests/audiorouting_tests.cpp
+++ b/media/libaudioclient/tests/audiorouting_tests.cpp
@@ -73,7 +73,6 @@
             }
         }
         ap->stop();
-        ap->getAudioTrackHandle()->removeAudioDeviceCallback(cb);
     }
 }
 

media/libaudioclient/tests/audiosystem_tests.cpp

diff --git a/media/libaudioclient/tests/audiosystem_tests.cpp b/media/libaudioclient/tests/audiosystem_tests.cpp
index ede62cc..b7a2d60 100644
--- a/media/libaudioclient/tests/audiosystem_tests.cpp
+++ b/media/libaudioclient/tests/audiosystem_tests.cpp
@@ -49,17 +49,11 @@
     void TearDown() override {
         if (mPlayback) {
             mPlayback->stop();
-            if (auto handle = mPlayback->getAudioTrackHandle(); handle) {
-                handle->removeAudioDeviceCallback(mCbPlayback);
-            }
             mCbPlayback.clear();
             mPlayback.clear();
         }
         if (mCapture) {
             mCapture->stop();
-            if (auto handle = mCapture->getAudioRecordHandle(); handle) {
-                handle->removeAudioDeviceCallback(mCbRecord);
-            }
             mCbRecord.clear();
             mCapture.clear();
         }