Merge "Modify hidl_pointer default constructor"
diff --git a/base/HidlSupport.cpp b/base/HidlSupport.cpp
index 094e0b1..01590c3 100644
--- a/base/HidlSupport.cpp
+++ b/base/HidlSupport.cpp
@@ -61,15 +61,13 @@
LOG(WARNING) << "getTransportFromManifest: Cannot find vendor interface manifest.";
return vintf::Transport::EMPTY;
}
- size_t majorVer;
- size_t minorVer;
- if ( !::android::base::ParseUint(fqName.getPackageMajorVersion(), &majorVer)
- || !::android::base::ParseUint(fqName.getPackageMinorVersion(), &minorVer)) {
+ if (!fqName.hasVersion()) {
LOG(ERROR) << "getTransportFromManifest: " << fqName.string()
<< " does not specify a version.";
return vintf::Transport::EMPTY;
}
- vintf::Transport tr = vm->getTransport(package, vintf::Version{majorVer, minorVer});
+ vintf::Transport tr = vm->getTransport(package,
+ vintf::Version{fqName.getPackageMajorVersion(), fqName.getPackageMinorVersion()});
if (tr == vintf::Transport::EMPTY) {
LOG(WARNING) << "getTransportFromManifest: Cannot find entry "
<< package << fqName.atVersion() << " in vendor interface manifest.";
@@ -397,8 +395,10 @@
const char *,
const char *,
std::vector<void *> *);
- auto cb = (cb_fun)dlsym(handle,
- ("HIDL_INSTRUMENTATION_FUNCTION_" + mInterfaceName).c_str());
+ FQName package_name = FQName(mInstrumentationLibPackage);
+ auto cb = (cb_fun)dlsym(handle, ("HIDL_INSTRUMENTATION_FUNCTION_"
+ + package_name.tokenName() + "_"
+ + mInterfaceName).c_str());
if ((error = dlerror()) != NULL) {
LOG(WARNING)
<< "couldn't find symbol: HIDL_INSTRUMENTATION_FUNCTION_"
diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index e3cbea4..9130d5b 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -102,6 +102,24 @@
return false;
}
+static void registerReference(const hidl_string &interfaceName, const hidl_string &instanceName) {
+ sp<IServiceManager> binderizedManager = defaultServiceManager();
+ if (binderizedManager == nullptr) {
+ LOG(WARNING) << "Could not registerReference for "
+ << interfaceName << "/" << instanceName
+ << ": null binderized manager.";
+ return;
+ }
+ auto ret = binderizedManager->registerPassthroughClient(interfaceName, instanceName, getpid());
+ if (!ret.isOk()) {
+ LOG(WARNING) << "Could not registerReference for "
+ << interfaceName << "/" << instanceName
+ << ": " << ret.description();
+ }
+ LOG(INFO) << "Successfully registerReference for "
+ << interfaceName << "/" << instanceName;
+}
+
struct PassthroughServiceManager : IServiceManager {
Return<sp<IBase>> get(const hidl_string& fqName,
const hidl_string& name) override {
@@ -156,6 +174,9 @@
<< " but could not find symbol " << sym;
return nullptr;
}
+
+ registerReference(fqName, name);
+
return (*generator)(name);
}
@@ -166,9 +187,20 @@
return false;
}
- Return<void> list(list_cb /* _hidl_cb */) override {
- // TODO: add this functionality
- LOG(FATAL) << "Cannot list services with passthrough service manager.";
+ Return<void> list(list_cb _hidl_cb) override {
+ std::vector<hidl_string> vec;
+ for (const std::string &path : {
+ HAL_LIBRARY_PATH_ODM, HAL_LIBRARY_PATH_VENDOR, HAL_LIBRARY_PATH_SYSTEM
+ }) {
+ std::vector<std::string> libs = search(path, "", ".so");
+ for (const std::string &lib : libs) {
+ std::string matchedName;
+ if (matchPackageName(lib, &matchedName)) {
+ vec.push_back(matchedName + "/*");
+ }
+ }
+ }
+ _hidl_cb(vec);
return Void();
}
Return<void> listByInterface(const hidl_string& /* fqInstanceName */,
@@ -186,25 +218,17 @@
return false;
}
- Return<void> debugDump(debugDump_cb _cb) override {
- std::vector<InstanceDebugInfo> vec;
- for (const std::string &path : {
- HAL_LIBRARY_PATH_ODM, HAL_LIBRARY_PATH_VENDOR, HAL_LIBRARY_PATH_SYSTEM
- }) {
- std::vector<std::string> libs = search(path, "", ".so");
- for (const std::string &lib : libs) {
- std::string matchedName;
- if (matchPackageName(lib, &matchedName)) {
- vec.push_back({
- .interfaceName = matchedName,
- .instanceName = "",
- .pid = -1,
- .ptr = 0,
- });
- }
- }
- }
- _cb(vec);
+ Return<void> debugDump(debugDump_cb) override {
+ // This makes no sense.
+ LOG(FATAL) << "Cannot call debugDump on passthrough service manager."
+ << "Call it on defaultServiceManager() instead.";
+ return Void();
+ }
+
+ Return<void> registerPassthroughClient(const hidl_string &, const hidl_string &, int32_t) override {
+ // This makes no sense.
+ LOG(FATAL) << "Cannot call registerPassthroughClient on passthrough service manager. "
+ << "Call it on defaultServiceManager() instead.";
return Void();
}
diff --git a/transport/manager/1.0/IServiceManager.hal b/transport/manager/1.0/IServiceManager.hal
index 2eafed0..61f6047 100644
--- a/transport/manager/1.0/IServiceManager.hal
+++ b/transport/manager/1.0/IServiceManager.hal
@@ -111,10 +111,7 @@
struct InstanceDebugInfo {
string interfaceName;
string instanceName;
- // negative values means N/A.
- int32_t pid;
- // 0 means N/A.
- uint64_t ptr;
+ vec<int32_t> clientPids;
};
/*
@@ -123,4 +120,6 @@
* instance.
*/
debugDump() generates (vec<InstanceDebugInfo> info);
+
+ oneway registerPassthroughClient(string fqName, string name, int32_t pid);
};