Hide HalGroup::getHals
Test: builds
Test: libvintf_test
Fixes: 74247301
Change-Id: Ie3b58ab42e66fab2f9d2e5d490461476d5c84d5d
diff --git a/include/vintf/HalGroup.h b/include/vintf/HalGroup.h
index 6e52401..74be9af 100644
--- a/include/vintf/HalGroup.h
+++ b/include/vintf/HalGroup.h
@@ -50,9 +50,9 @@
// Add an hal to this HalGroup so that it can be constructed programatically.
virtual bool add(Hal&& hal) { return addInternal(std::move(hal)) != nullptr; }
+ protected:
// Get all hals with the given name (e.g "android.hardware.camera").
// There could be multiple hals that matches the same given name.
- // TODO(b/74247301) Deprecated; use forEachInstanceOfPackage instead.
std::vector<const Hal*> getHals(const std::string& name) const {
std::vector<const Hal*> ret;
auto range = mHals.equal_range(name);
@@ -65,7 +65,6 @@
// Get all hals with the given name (e.g "android.hardware.camera").
// There could be multiple hals that matches the same given name.
// Non-const version of the above getHals() method.
- // TODO(b/74247301) Deprecated; use forEachInstanceOfPackage instead.
std::vector<Hal*> getHals(const std::string& name) {
std::vector<Hal*> ret;
auto range = mHals.equal_range(name);
@@ -75,6 +74,7 @@
return ret;
}
+ public:
// Apply func to all instances.
bool forEachInstance(const std::function<bool(const InstanceType&)>& func) const {
for (const auto& hal : getHals()) {
diff --git a/test/LibVintfTest.cpp b/test/LibVintfTest.cpp
index f19fa96..2cddad8 100644
--- a/test/LibVintfTest.cpp
+++ b/test/LibVintfTest.cpp
@@ -101,6 +101,12 @@
ConstMultiMapValueIterable<std::string, ManifestHal> getHals(const HalManifest& vm) {
return vm.getHals();
}
+ std::vector<const ManifestHal*> getHals(const HalManifest& vm, const std::string& name) {
+ return vm.getHals(name);
+ }
+ std::vector<const MatrixHal*> getHals(const CompatibilityMatrix& cm, const std::string& name) {
+ return cm.getHals(name);
+ }
bool isValid(const ManifestHal &mh) {
return mh.isValid();
}
@@ -741,11 +747,11 @@
{Version(1, 0), Version(2, 1)},
{Transport::PASSTHROUGH, Arch::ARCH_32_64},
{{"INfc", {"INfc", {"default"}}}}};
- auto cameraHals = vm.getHals("android.hardware.camera");
+ auto cameraHals = getHals(vm, "android.hardware.camera");
EXPECT_EQ((int)cameraHals.size(), 2);
EXPECT_EQ(*cameraHals[0], expectedCameraHalV1_2);
EXPECT_EQ(*cameraHals[1], expectedCameraHalV2_0);
- auto nfcHals = vm.getHals("android.hardware.nfc");
+ auto nfcHals = getHals(vm, "android.hardware.nfc");
EXPECT_EQ((int)nfcHals.size(), 1);
EXPECT_EQ(*nfcHals[0], expectedNfcHal);
}
@@ -775,10 +781,10 @@
{{VersionRange(4, 5, 6), VersionRange(10, 11, 12)}},
true /* optional */,
testHalInterfaces()};
- auto cameraHals = cm.getHals("android.hardware.camera");
+ auto cameraHals = getHals(cm, "android.hardware.camera");
EXPECT_EQ((int)cameraHals.size(), 1);
EXPECT_EQ(*cameraHals[0], expectedCameraHal);
- auto nfcHals = cm.getHals("android.hardware.nfc");
+ auto nfcHals = getHals(cm, "android.hardware.nfc");
EXPECT_EQ((int)nfcHals.size(), 1);
EXPECT_EQ(*nfcHals[0], expectedNfcHal);
}
@@ -2658,10 +2664,10 @@
" </hal>\n"
"</manifest>\n";
EXPECT_TRUE(gHalManifestConverter(&manifest, xml)) << gHalManifestConverter.lastError();
- const auto& foo = manifest.getHals("android.hardware.foo");
+ const auto& foo = getHals(manifest, "android.hardware.foo");
ASSERT_FALSE(foo.empty());
EXPECT_TRUE(foo.front()->isOverride());
- const auto& bar = manifest.getHals("android.hardware.bar");
+ const auto& bar = getHals(manifest, "android.hardware.bar");
ASSERT_FALSE(bar.empty());
EXPECT_FALSE(bar.front()->isOverride());
}
@@ -3112,13 +3118,13 @@
"</manifest>\n";
ASSERT_TRUE(gHalManifestConverter(&manifest, xml, &error)) << error;
- auto foo = manifest.getHals("android.hardware.foo");
+ auto foo = getHals(manifest, "android.hardware.foo");
ASSERT_EQ(1u, foo.size());
EXPECT_TRUE(foo.front()->isDisabledHal());
- auto bar = manifest.getHals("android.hardware.bar");
+ auto bar = getHals(manifest, "android.hardware.bar");
ASSERT_EQ(1u, bar.size());
EXPECT_FALSE(bar.front()->isDisabledHal());
- auto baz = manifest.getHals("android.hardware.baz");
+ auto baz = getHals(manifest, "android.hardware.baz");
ASSERT_EQ(1u, baz.size());
EXPECT_FALSE(baz.front()->isDisabledHal());
}
