commit 5cfbc92dbc3972c793e9c793b7dd4977a63f5faf
author Michael Schwartz <schwartzmi@google.com> Mon May 08 14:06:49 2017 -0700
committer Michael Schwartz <schwartzmi@google.com> Tue May 09 20:25:36 2017 -0700
tree 57bb768e4b208f00b8d91bb3d2865a5ea0c4d6b7
parent 3477f0479f1075d9812ac20188e096510f171db8

Improve error message for AVB failures

Bug: 38131335
Test: `m -j libvintf_test` and run test.
Change-Id: I952da9d08cfb0e16855bf63167e6067716abe777

RuntimeInfo.cpp

diff --git a/RuntimeInfo.cpp b/RuntimeInfo.cpp
index 7b97e94..b29a146 100644
--- a/RuntimeInfo.cpp
+++ b/RuntimeInfo.cpp
@@ -119,10 +119,23 @@
     }
 
     const Version &matAvb = mat.framework.mAvbMetaVersion;
-    if (mBootAvbVersion.majorVer != matAvb.majorVer ||
-        mBootAvbVersion.minorVer <  matAvb.minorVer ||
-        mBootVbmetaAvbVersion.majorVer != matAvb.majorVer ||
-        mBootVbmetaAvbVersion.minorVer <  matAvb.minorVer) {
+    if (mBootAvbVersion.majorVer != matAvb.majorVer || mBootAvbVersion.minorVer < matAvb.minorVer) {
+        if (error != nullptr) {
+            std::stringstream ss;
+            ss << "AVB version " << mBootAvbVersion << " does not match framework matrix "
+               << matAvb;
+            *error = ss.str();
+        }
+        return false;
+    }
+    if (mBootVbmetaAvbVersion.majorVer != matAvb.majorVer ||
+        mBootVbmetaAvbVersion.minorVer < matAvb.minorVer) {
+        if (error != nullptr) {
+            std::stringstream ss;
+            ss << "Vbmeta version " << mBootVbmetaAvbVersion << " does not match framework matrix "
+               << matAvb;
+            *error = ss.str();
+        }
         return false;
     }