commit 08b38d01b7ad88c3197c6010a71d483c0e74547e
author hkuang <hkuang@google.com> Fri Apr 17 14:29:33 2020 -0700
committer hkuang <hkuang@google.com> Fri Apr 17 18:08:28 2020 -0700
tree 8ccbff470ca9ed279a2af0238cde4c0b412bda80
parent 6709a937953cf92b73fb057ec9e4e0616ab3e6c5

MediaTranscodingService: Add some missing build flags to Android.bp

The build flag uncover some locking are missed and this CL also fixes
them.

Bug: 145233472
Test: Unit test
Change-Id: Ide999b95f064adf14967cc2e36331524e83426d2

media/libmediatranscoding/TranscodingClientManager.cpp

diff --git a/media/libmediatranscoding/TranscodingClientManager.cpp b/media/libmediatranscoding/TranscodingClientManager.cpp
index b05e3a6..bfa08a2 100644
--- a/media/libmediatranscoding/TranscodingClientManager.cpp
+++ b/media/libmediatranscoding/TranscodingClientManager.cpp
@@ -59,8 +59,8 @@
     // Pointer to the client manager for this client
     TranscodingClientManager* mOwner;
 
-    ClientImpl(const std::shared_ptr<ITranscodingClientCallback>& callback, pid_t pid,
-            uid_t uid, const std::string& clientName, const std::string& opPackageName,
+    ClientImpl(const std::shared_ptr<ITranscodingClientCallback>& callback, pid_t pid, uid_t uid,
+               const std::string& clientName, const std::string& opPackageName,
                TranscodingClientManager* owner);
 
     Status submitRequest(const TranscodingRequestParcel& /*in_request*/,
@@ -156,15 +156,12 @@
     ALOGD("TranscodingClientManager exited");
 }
 
-bool TranscodingClientManager::isClientIdRegistered(ClientIdType clientId) const {
-    return mClientIdToClientMap.find(clientId) != mClientIdToClientMap.end();
-}
-
 void TranscodingClientManager::dumpAllClients(int fd, const Vector<String16>& args __unused) {
     String8 result;
 
     const size_t SIZE = 256;
     char buffer[SIZE];
+    std::scoped_lock lock{mLock};
 
     snprintf(buffer, SIZE, "    Total num of Clients: %zu\n", mClientIdToClientMap.size());
     result.append(buffer);
@@ -200,7 +197,7 @@
     std::scoped_lock lock{mLock};
 
     // Checks if the client already registers.
-    if (isClientIdRegistered(client->mClientId)) {
+    if (mClientIdToClientMap.find(client->mClientId) != mClientIdToClientMap.end()) {
         return ALREADY_EXISTS;
     }