Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not fail early when one of the verification fails so that we don't delete the apk file while the other verification is still accessing it."

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-14 13:53:16 +00:00
committed by Android (Google) Code Review
parent 98d19712c9 ff5dec9933
commit b8144ae516
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -14707,8 +14707,7 @@ public class PackageManagerService extends IPackageManager.Stub
void handleVerificationFinished() {
if (!mVerificationCompleted) {
mVerificationCompleted = true;
if (mIntegrityVerificationCompleted || mRet != INSTALL_SUCCEEDED) {
mIntegrityVerificationCompleted = true;
if (mIntegrityVerificationCompleted) {
handleReturnCode();
}
// integrity verification still pending.
@@ -14718,8 +14717,7 @@ public class PackageManagerService extends IPackageManager.Stub
void handleIntegrityVerificationFinished() {
if (!mIntegrityVerificationCompleted) {
mIntegrityVerificationCompleted = true;
if (mVerificationCompleted || mRet != INSTALL_SUCCEEDED) {
mVerificationCompleted = true;
if (mVerificationCompleted) {
handleReturnCode();
}
// verifier still pending