Merge "Skip calling verify_package_compatibility when resuming."

am: 98beb6414b

Change-Id: I32bc699f4f009bee490ff509bd8503d81766bf30
This commit is contained in:
Tao Bao
2019-03-18 16:21:59 -07:00
committed by android-build-merger
+2 -2
View File
@@ -606,8 +606,8 @@ static int really_install_package(const std::string& path, bool* wipe_cache, boo
return INSTALL_CORRUPT; return INSTALL_CORRUPT;
} }
// Additionally verify the compatibility of the package. // Additionally verify the compatibility of the package if it's a fresh install.
if (!verify_package_compatibility(zip)) { if (retry_count == 0 && !verify_package_compatibility(zip)) {
log_buffer->push_back(android::base::StringPrintf("error: %d", kPackageCompatibilityFailure)); log_buffer->push_back(android::base::StringPrintf("error: %d", kPackageCompatibilityFailure));
return INSTALL_CORRUPT; return INSTALL_CORRUPT;
} }