summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifan Hong2017-08-15 15:46:03 -0500
committerYifan Hong2017-08-16 14:45:40 -0500
commita1bb1935a7e413ef66c046e09b7211b5ac4591bd (patch)
tree7ed57d01e5b22f1c7fe9edd5ff432c83a29236a7
parenta49459e9e2bbf268a7451585c197eb3a4e6f1aaf (diff)
downloadplatform-system-libvintf-a1bb1935a7e413ef66c046e09b7211b5ac4591bd.tar.gz
platform-system-libvintf-a1bb1935a7e413ef66c046e09b7211b5ac4591bd.tar.xz
platform-system-libvintf-a1bb1935a7e413ef66c046e09b7211b5ac4591bd.zip
Enable AVB version matching in Runtime
Test: `adb shell vintf` shows compatible Test: boots Bug: 38325029 Change-Id: I6857a391bfa2a6f8ef68a2ac0374c7e5c8f62e93
-rw-r--r--RuntimeInfo.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/RuntimeInfo.cpp b/RuntimeInfo.cpp
index 213d898..b29a146 100644
--- a/RuntimeInfo.cpp
+++ b/RuntimeInfo.cpp
@@ -118,8 +118,6 @@ bool RuntimeInfo::checkCompatibility(const CompatibilityMatrix &mat,
118 } 118 }
119 } 119 }
120 120
121 // TODO(b/38325029) enable avb check when avb version is injected to fwk matrix.
122#if 0
123 const Version &matAvb = mat.framework.mAvbMetaVersion; 121 const Version &matAvb = mat.framework.mAvbMetaVersion;
124 if (mBootAvbVersion.majorVer != matAvb.majorVer || mBootAvbVersion.minorVer < matAvb.minorVer) { 122 if (mBootAvbVersion.majorVer != matAvb.majorVer || mBootAvbVersion.minorVer < matAvb.minorVer) {
125 if (error != nullptr) { 123 if (error != nullptr) {
@@ -140,7 +138,6 @@ bool RuntimeInfo::checkCompatibility(const CompatibilityMatrix &mat,
140 } 138 }
141 return false; 139 return false;
142 } 140 }
143#endif
144 141
145 return true; 142 return true;
146} 143}