commit 205e282f43152ab2c73053f0ecc4b4d397663506
author Jooyung Han <jooyung@google.com> Tue Dec 19 16:59:39 2023 +0900
committer Jooyung Han <jooyung@google.com> Fri Jan 26 02:43:42 2024 +0900
tree 4e96e434c00e759aa3bd3cf8c6cb06fa60c01f9c
parent 9f1c687f36381f1fc45a9f7ca6311fd30bcbdf15

Query methods for VINTF native instances

isDeclared(name), getDeclaredInstances(interface),
updatableViaApex(name), and getUpdatableNames(apexName) are extended to
support native instances when
- "name" is formatted as e.g. "mapper/minigbm",
- "interface" is formatted as e.g. "mapper"

Bug: 316051788
Test: atest servicemanager_test
Test: atest --host servicemanager_unittest
Change-Id: I0520888dbf5d30c66b97058f45cd6828731ca8bc

cmds/servicemanager/test_sm.cpp

diff --git a/cmds/servicemanager/test_sm.cpp b/cmds/servicemanager/test_sm.cpp
index 97e500d..b575053 100644
--- a/cmds/servicemanager/test_sm.cpp
+++ b/cmds/servicemanager/test_sm.cpp
@@ -361,6 +361,24 @@
     EXPECT_EQ(std::vector<std::string>{}, names);
 }
 
+TEST(Vintf, IsDeclared_native) {
+    if (!isCuttlefishPhone()) GTEST_SKIP() << "Skipping non-Cuttlefish-phone devices";
+
+    auto sm = getPermissiveServiceManager();
+    bool declared = false;
+    EXPECT_TRUE(sm->isDeclared("mapper/minigbm", &declared).isOk());
+    EXPECT_TRUE(declared);
+}
+
+TEST(Vintf, GetDeclaredInstances_native) {
+    if (!isCuttlefishPhone()) GTEST_SKIP() << "Skipping non-Cuttlefish-phone devices";
+
+    auto sm = getPermissiveServiceManager();
+    std::vector<std::string> instances;
+    EXPECT_TRUE(sm->getDeclaredInstances("mapper", &instances).isOk());
+    EXPECT_EQ(std::vector<std::string>{"minigbm"}, instances);
+}
+
 class CallbackHistorian : public BnServiceCallback {
     Status onRegistration(const std::string& name, const sp<IBinder>& binder) override {
         registrations.push_back(name);