commit db9dabb826478c7fceb13c0fc69cd4cb12dca5ab
author Tao Bao <tbao@google.com> Mon Mar 18 16:27:01 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Mar 18 16:27:01 2019 -0700
tree c3fbee69bffd6415d8226a6904d3d3a94267f8ce
parent 8a9a4a1e0582b5b99e9e8b2c3d7443000de78826
parent c4148b529a832897e1f24deb779ba37a52a091d1

Merge "Skip calling verify_package_compatibility when resuming." am: 98beb6414b
am: c4148b529a

Change-Id: I7f59a1eb51e83443b77f8ae61139af12149eaca8

install.cpp

diff --git a/install.cpp b/install.cpp
index 05f9af7..dbc815d 100644
--- a/install.cpp
+++ b/install.cpp
@@ -606,8 +606,8 @@
     return INSTALL_CORRUPT;
   }
 
-  // Additionally verify the compatibility of the package.
-  if (!verify_package_compatibility(zip)) {
+  // Additionally verify the compatibility of the package if it's a fresh install.
+  if (retry_count == 0 && !verify_package_compatibility(zip)) {
     log_buffer->push_back(android::base::StringPrintf("error: %d", kPackageCompatibilityFailure));
     return INSTALL_CORRUPT;
   }