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

Merge "Prevent interleaved verification" into tm-qpr-dev

Browse Source
This commit is contained in:
Chun-Wei Wang
2022-11-22 12:28:40 +00:00
committed by Android (Google) Code Review
parent 43f386b380 2e968c8076
commit e16da5a4e0
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/pm/PackageInstallerSession.java
View File

@@ -366,6 +366,14 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
@GuardedBy("mLock") @GuardedBy("mLock")
private boolean mStageDirInUse = false; private boolean mStageDirInUse = false;
/**
* True if the verification is already in progress. This is used to prevent running
* verification again while one is already in progress which will break internal states.
*
* Worker thread only.
*/
private boolean mVerificationInProgress = false;
/** Permissions have been accepted by the user (see {@link #setPermissionsResult}) */ /** Permissions have been accepted by the user (see {@link #setPermissionsResult}) */
@GuardedBy("mLock") @GuardedBy("mLock")
private boolean mPermissionsManuallyAccepted = false; private boolean mPermissionsManuallyAccepted = false;
@@ -2136,6 +2144,12 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
return; return;
} }
if (mVerificationInProgress) {
Slog.w(TAG, "Verification is already in progress for session " + sessionId);
return;
}
mVerificationInProgress = true;
if (params.isStaged) { if (params.isStaged) {
mStagedSession.verifySession(); mStagedSession.verifySession();
} else { } else {