commit 97432db43cc64b7122117b0c1edad099665c98ac
author Martijn Coenen <maco@google.com> Fri Apr 28 23:23:42 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 28 23:23:44 2017 +0000
tree c69dd4a0c6ec6bdd7e5b17ddd5a1cbacf8320fa6
parent 469045b2e94585f33241648e9a3c1bbcf5c26f53
parent c93fb349163ff4d8a7be729643085f122c527ab5

Merge "Make registerPassthroughClient() synchronous."

ServiceManager.cpp

diff --git a/ServiceManager.cpp b/ServiceManager.cpp
index 7c4d90e..973da58 100644
--- a/ServiceManager.cpp
+++ b/ServiceManager.cpp
@@ -340,7 +340,8 @@
 
 
 Return<void> ServiceManager::registerPassthroughClient(const hidl_string &fqName,
-        const hidl_string &name, int32_t pid) {
+        const hidl_string &name) {
+    pid_t pid = IPCThreadState::self()->getCallingPid();
 
     PackageInterfaceMap &ifaceMap = mServiceMap[fqName];
 

ServiceManager.h

diff --git a/ServiceManager.h b/ServiceManager.h
index 0b99a4e..9fafadf 100644
--- a/ServiceManager.h
+++ b/ServiceManager.h
@@ -45,7 +45,7 @@
 
     Return<void> debugDump(debugDump_cb _cb) override;
     Return<void> registerPassthroughClient(const hidl_string &fqName,
-            const hidl_string &name, int32_t pid) override;
+            const hidl_string &name) override;
 
     virtual void serviceDied(uint64_t cookie, const wp<IBase>& who);
 private: