commit 82c6fdd9d4663df32a5100d96aa3c67adfea79d3
author Yifan Hong <elsk@google.com> Tue May 23 18:47:33 2017 +0000
committer Yifan Hong <elsk@google.com> Tue May 23 21:13:03 2017 +0000
tree d123c494554f622b63be3382b1e579f45f7971ba
parent c1ac82d94c148451ed5b0fde9fc6b11d42529161

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

This reverts commit c1ac82d94c148451ed5b0fde9fc6b11d42529161.

Test: adb shell vintf | tail

Bug: 38321140

Change-Id: Idc31af61f19d7481341e926e719f1aeced28d25c
Fixes: 38325817

VintfObject.cpp

diff --git a/VintfObject.cpp b/VintfObject.cpp
index 4558708..16fe34e 100644
--- a/VintfObject.cpp
+++ b/VintfObject.cpp
@@ -286,9 +286,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;
         }
     }