commit ec783ee0cabd3b2127dae90190e6f84a75791ff9
author Treehugger Robot <treehugger-gerrit@google.com> Mon May 01 23:19:24 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 01 23:19:24 2017 +0000
tree f00b0fbedc19c4cf03c6385d8c004b9ed9666fd9
parent 97432db43cc64b7122117b0c1edad099665c98ac
parent dc36fb27819c67ac36d424c487eae55c5301e8d5

Merge "Remove obsolete TODO regarding libhidltransport."

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:

Vintf.cpp

diff --git a/Vintf.cpp b/Vintf.cpp
index f00a9ea..c690eca 100644
--- a/Vintf.cpp
+++ b/Vintf.cpp
@@ -1,4 +1,5 @@
 #define LOG_TAG "hwservicemanager"
+//#define LOG_NDEBUG 0
 
 #include "Vintf.h"
 
@@ -24,16 +25,16 @@
 vintf::Transport getTransport(const std::string &interfaceName, const std::string &instanceName) {
     FQName fqName(interfaceName);
     if (!fqName.isValid()) {
-        LOG(ERROR) << "getTransport: " << interfaceName << " is not a valid fully-qualified name.";
+        LOG(DEBUG) << "getTransport: " << interfaceName << " is not a valid fully-qualified name.";
         return vintf::Transport::EMPTY;
     }
     if (!fqName.hasVersion()) {
-        LOG(ERROR) << "getTransport: " << fqName.string()
+        LOG(DEBUG) << "getTransport: " << fqName.string()
                    << " does not specify a version. Using default transport.";
         return vintf::Transport::EMPTY;
     }
     if (fqName.name().empty()) {
-        LOG(ERROR) << "getTransport: " << fqName.string()
+        LOG(DEBUG) << "getTransport: " << fqName.string()
                    << " does not specify an interface name. Using default transport.";
         return vintf::Transport::EMPTY;
     }
@@ -56,4 +57,4 @@
 }
 
 }  // hardware
-}  // android
\ No newline at end of file
+}  // android