OSDN Git Service

RecoverySystem: Enable the package compatibility verification.
authorTao Bao <tbao@google.com>
Tue, 18 Apr 2017 22:53:40 +0000 (15:53 -0700)
committerTao Bao <tbao@google.com>
Tue, 18 Apr 2017 22:54:28 +0000 (15:54 -0700)
Hook up to android.os.VintfObject.verify().

Bug: 36592877
Test: Flash on marlin; verify with package that has and doesn't have
      compatibility.zip entry.
Change-Id: I4e73fa42f4e3fd2e1c5ffec2ffa6152538d62eee

core/java/android/os/RecoverySystem.java

index bb0fdbe..447f280 100644 (file)
@@ -353,9 +353,7 @@ public class RecoverySystem {
         if (list.isEmpty()) {
             throw new IOException("no entries found in the compatibility file");
         }
-        // TODO(b/36814503): Enable the actual verification when VintfObject APIs are ready.
-        // return (VintfObject.verify(list.toArray(new String[list.size()])) == 0);
-        return true;
+        return (VintfObject.verify(list.toArray(new String[list.size()])) == 0);
     }
 
     /**