AudioFlinger: Extract inner Client class
Test: atest audiorecord_tests audiotrack_tests audiorouting_tests trackplayerbase_tests audiosystem_tests
Test: atest AudioTrackTest AudioRecordTest
Test: YouTube and Camera
Bug: 288339104
Bug: 289135349
Merged-In: I5b2973c12b3d36663fadd2e5ed362602785e1447
Change-Id: I5b2973c12b3d36663fadd2e5ed362602785e1447
(cherry picked from commit 59867e43c84de5563c73043594e13941cd016246)
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 5e90a34..4ae070b 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -1029,7 +1029,7 @@
return NO_ERROR;
}
-sp<AudioFlinger::Client> AudioFlinger::registerPid(pid_t pid)
+sp<Client> AudioFlinger::registerPid(pid_t pid)
{
Mutex::Autolock _cl(mClientLock);
// If pid is already in the mClients wp<> map, then use that entry
@@ -2311,19 +2311,19 @@
// ----------------------------------------------------------------------------
-AudioFlinger::Client::Client(const sp<AudioFlinger>& audioFlinger, pid_t pid)
+Client::Client(const sp<AudioFlinger>& audioFlinger, pid_t pid)
: RefBase(),
mAudioFlinger(audioFlinger),
mPid(pid),
mClientAllocator(AllocatorFactory::getClientAllocator()) {}
// Client destructor must be called with AudioFlinger::mClientLock held
-AudioFlinger::Client::~Client()
+Client::~Client()
{
mAudioFlinger->removeClient_l(mPid);
}
-AllocatorFactory::ClientAllocator& AudioFlinger::Client::allocator()
+AllocatorFactory::ClientAllocator& Client::allocator()
{
return mClientAllocator;
}