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

am: db9dabb826

Change-Id: Ic4948239024645f99c96bda5e41524bfe4d07d7d

install.cpp

@@ -606,8 +606,8 @@ static int really_install_package(const std::string& path, bool* wipe_cache, boo
     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;
   }