summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifan Hong2017-08-23 16:51:51 -0500
committerYifan Hong2017-08-24 12:16:04 -0500
commit69340357fd09afdbf35d18b549fd12088a7bdafc (patch)
tree8b6cef81a8be23064449657efe1806126ddcceb9
parente8d3216329695f9699943371eefb7e3ea1f4b80d (diff)
downloadplatform-system-libvintf-69340357fd09afdbf35d18b549fd12088a7bdafc.tar.gz
platform-system-libvintf-69340357fd09afdbf35d18b549fd12088a7bdafc.tar.xz
platform-system-libvintf-69340357fd09afdbf35d18b549fd12088a7bdafc.zip
Remove unused CompatibilityMatrix::findKernel
findKernel is no longer used by RuntimeInfo::checkCompatibility. Test: mma Bug: 64124223 Change-Id: I1f620a935ef788a084a8a73cfe80badb3db9a0f5 Merged-In: I1f620a935ef788a084a8a73cfe80badb3db9a0f5
-rw-r--r--CompatibilityMatrix.cpp13
-rw-r--r--include/vintf/CompatibilityMatrix.h3
2 files changed, 0 insertions, 16 deletions
diff --git a/CompatibilityMatrix.cpp b/CompatibilityMatrix.cpp
index 509ca1d..f320861 100644
--- a/CompatibilityMatrix.cpp
+++ b/CompatibilityMatrix.cpp
@@ -36,19 +36,6 @@ bool CompatibilityMatrix::add(MatrixKernel &&kernel) {
36 return true; 36 return true;
37} 37}
38 38
39const MatrixKernel *CompatibilityMatrix::findKernel(const KernelVersion &v) const {
40 if (mType != SchemaType::FRAMEWORK) {
41 return nullptr;
42 }
43 for (const MatrixKernel &matrixKernel : framework.mKernels) {
44 if (matrixKernel.minLts().version == v.version &&
45 matrixKernel.minLts().majorRev == v.majorRev) {
46 return matrixKernel.minLts().minorRev <= v.minorRev ? &matrixKernel : nullptr;
47 }
48 }
49 return nullptr;
50}
51
52SchemaType CompatibilityMatrix::type() const { 39SchemaType CompatibilityMatrix::type() const {
53 return mType; 40 return mType;
54} 41}
diff --git a/include/vintf/CompatibilityMatrix.h b/include/vintf/CompatibilityMatrix.h
index 94b8004..36aac51 100644
--- a/include/vintf/CompatibilityMatrix.h
+++ b/include/vintf/CompatibilityMatrix.h
@@ -58,9 +58,6 @@ struct CompatibilityMatrix : public HalGroup<MatrixHal>, public XmlFileGroup<Mat
58 bool add(MatrixHal &&hal); 58 bool add(MatrixHal &&hal);
59 bool add(MatrixKernel &&kernel); 59 bool add(MatrixKernel &&kernel);
60 60
61 // Find a MatrixKernel entry that has version v. nullptr if not found.
62 const MatrixKernel *findKernel(const KernelVersion &v) const;
63
64 status_t fetchAllInformation(const std::string &path); 61 status_t fetchAllInformation(const std::string &path);
65 62
66 friend struct HalManifest; 63 friend struct HalManifest;