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

Do not fail early when one of the verification fails so that we don't

Browse Source 
delete the apk file while the other verification is still accessing it.

Test: locally verified that the exception does not occur anymore.
Bug:145674131
Change-Id: I16c37a9acb9e02b4c454c1ad036167a42aed2c66
This commit is contained in:
Song Pan
2020-02-06 10:58:26 +00:00
parent d9e45183cb
commit ff5dec9933
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

@@ -14704,8 +14704,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.
@@ -14715,8 +14714,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