summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tao Bao <tbao@google.com> 2017-04-18 15:53:40 -0700
committer Tao Bao <tbao@google.com> 2017-04-18 15:54:28 -0700
commit87daeb15fdc49c51798e6f97310f8aeb38c19c44 (patch)
tree737f1d35b2a67ab6affef16b55befa1829a330be
parente01b520dd490935694a50f9f0abd7dc0564d95c5 (diff)
RecoverySystem: Enable the package compatibility verification.
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
-rw-r--r--core/java/android/os/RecoverySystem.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java
index bb0fdbe4e26a..447f2805d075 100644
--- a/core/java/android/os/RecoverySystem.java
+++ b/core/java/android/os/RecoverySystem.java
@@ -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);
}
/**