commit e8b8684a74a8863961ebeb8c98d4141c119d42bb
author Yifan Hong <elsk@google.com> Thu May 25 17:59:22 2017 +0000
committer Yifan Hong <elsk@google.com> Thu May 25 12:45:13 2017 -0700
tree da0ed00cc6614f3fd2fee5cbbef35f5c07eeecd8
parent 3973355c3c029b1b0741d34db5caa8daf3353588

Revert "Revert "Revert "Temporary workaround for fwk compat mat vs. Runtime info"""

Enable fwk compat mat check against runtime info. There
were selinux denials because clients of libvintf doesn't
have permission to read /sys/fs/selinux/policyvers, and
the denial is hidden by a workaround (the original CL).
Removing the workaround exposes the selinux denial. An
accompanying CL fixes the denial, hence the check can
be reenabled again.

Test: pass

This reverts commit 6b7ecc03ba2deaee255d2aa93485a6ab26dd9c3b.

Change-Id: I6e0780f3d88ce03bbeb949bb3d11bedaa6132fcb
Fixes: 38325817

VintfObject.cpp

diff --git a/VintfObject.cpp b/VintfObject.cpp
index 4f757bd..f785e6b 100644
--- a/VintfObject.cpp
+++ b/VintfObject.cpp
@@ -281,9 +281,7 @@
             if (error)
                 error->insert(0, "Runtime info and framework compatibility matrix "
                                  "are incompatible: ");
-            // TODO(b/38325029): OTA should check compatibility of kernel version
-            // and AVB version.
-            // return INCOMPATIBLE;
+            return INCOMPATIBLE;
         }
     }