Remove skipCache for static XMLs
The argument was created for vintf_object_tests before VintfObject is
instantiated as an object. Now that an empty VintfObject is created
before each test, this argument can be safely dropped.
Test: unit tests
Bug: 110855270
Change-Id: I4418dd20f621067ca7f5c126e603cd353525b8bf
diff --git a/VintfObject.cpp b/VintfObject.cpp
index c6ee42d..af075d4 100644
--- a/VintfObject.cpp
+++ b/VintfObject.cpp
@@ -48,10 +48,10 @@
#endif
template <typename T, typename F>
-static std::shared_ptr<const T> Get(const char* id, LockedSharedPtr<T>* ptr, bool skipCache,
+static std::shared_ptr<const T> Get(const char* id, LockedSharedPtr<T>* ptr,
const F& fetchAllInformation) {
std::unique_lock<std::mutex> _lock(ptr->mutex);
- if (skipCache || !ptr->fetchedOnce) {
+ if (!ptr->fetchedOnce) {
LOG(INFO) << id << ": Reading VINTF information.";
ptr->object = std::make_unique<T>();
std::string error;
@@ -99,53 +99,50 @@
return sInstance.object;
}
-std::shared_ptr<const HalManifest> VintfObject::GetDeviceHalManifest(bool skipCache) {
- return GetInstance()->getDeviceHalManifest(skipCache);
+std::shared_ptr<const HalManifest> VintfObject::GetDeviceHalManifest() {
+ return GetInstance()->getDeviceHalManifest();
}
-std::shared_ptr<const HalManifest> VintfObject::getDeviceHalManifest(bool skipCache) {
- return Get(__func__, &mDeviceManifest, skipCache,
+std::shared_ptr<const HalManifest> VintfObject::getDeviceHalManifest() {
+ return Get(__func__, &mDeviceManifest,
std::bind(&VintfObject::fetchDeviceHalManifest, this, _1, _2));
}
-std::shared_ptr<const HalManifest> VintfObject::GetFrameworkHalManifest(bool skipCache) {
- return GetInstance()->getFrameworkHalManifest(skipCache);
+std::shared_ptr<const HalManifest> VintfObject::GetFrameworkHalManifest() {
+ return GetInstance()->getFrameworkHalManifest();
}
-std::shared_ptr<const HalManifest> VintfObject::getFrameworkHalManifest(bool skipCache) {
- return Get(__func__, &mFrameworkManifest, skipCache,
+std::shared_ptr<const HalManifest> VintfObject::getFrameworkHalManifest() {
+ return Get(__func__, &mFrameworkManifest,
std::bind(&VintfObject::fetchFrameworkHalManifest, this, _1, _2));
}
-std::shared_ptr<const CompatibilityMatrix> VintfObject::GetDeviceCompatibilityMatrix(bool skipCache) {
- return GetInstance()->getDeviceCompatibilityMatrix(skipCache);
+std::shared_ptr<const CompatibilityMatrix> VintfObject::GetDeviceCompatibilityMatrix() {
+ return GetInstance()->getDeviceCompatibilityMatrix();
}
-std::shared_ptr<const CompatibilityMatrix> VintfObject::getDeviceCompatibilityMatrix(
- bool skipCache) {
- return Get(__func__, &mDeviceMatrix, skipCache,
- std::bind(&VintfObject::fetchDeviceMatrix, this, _1, _2));
+std::shared_ptr<const CompatibilityMatrix> VintfObject::getDeviceCompatibilityMatrix() {
+ return Get(__func__, &mDeviceMatrix, std::bind(&VintfObject::fetchDeviceMatrix, this, _1, _2));
}
-std::shared_ptr<const CompatibilityMatrix> VintfObject::GetFrameworkCompatibilityMatrix(bool skipCache) {
- return GetInstance()->getFrameworkCompatibilityMatrix(skipCache);
+std::shared_ptr<const CompatibilityMatrix> VintfObject::GetFrameworkCompatibilityMatrix() {
+ return GetInstance()->getFrameworkCompatibilityMatrix();
}
-std::shared_ptr<const CompatibilityMatrix> VintfObject::getFrameworkCompatibilityMatrix(
- bool skipCache) {
+std::shared_ptr<const CompatibilityMatrix> VintfObject::getFrameworkCompatibilityMatrix() {
// To avoid deadlock, get device manifest before any locks.
auto deviceManifest = getDeviceHalManifest();
std::unique_lock<std::mutex> _lock(mFrameworkCompatibilityMatrixMutex);
auto combined =
- Get(__func__, &mCombinedFrameworkMatrix, skipCache,
+ Get(__func__, &mCombinedFrameworkMatrix,
std::bind(&VintfObject::getCombinedFrameworkMatrix, this, deviceManifest, _1, _2));
if (combined != nullptr) {
return combined;
}
- return Get(__func__, &mFrameworkMatrix, skipCache,
+ return Get(__func__, &mFrameworkMatrix,
std::bind(&CompatibilityMatrix::fetchAllInformation, _1, getFileSystem().get(),
kSystemLegacyMatrix, _2));
}