Prevent committing session while in progress
Committing a session twice in a row will result in interleaved verification flows and break the internal states. Add a field to prevent committing again while the installation is already in progress. Bug: 256330705 Test: will add CTS Change-Id: I1f5a90acde1874b3efbe4dad55f366e991bb4a21
This commit is contained in:
@@ -380,6 +380,14 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
|
|||||||
@GuardedBy("mLock")
|
@GuardedBy("mLock")
|
||||||
private boolean mStageDirInUse = false;
|
private boolean mStageDirInUse = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* True if the installation is already in progress. This is used to prevent the caller
|
||||||
|
* from {@link #commit(IntentSender, boolean) committing} the session again while the
|
||||||
|
* installation is still in progress.
|
||||||
|
*/
|
||||||
|
@GuardedBy("mLock")
|
||||||
|
private boolean mInstallationInProgress = 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;
|
||||||
@@ -1692,6 +1700,14 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
synchronized (mLock) {
|
||||||
|
if (mInstallationInProgress) {
|
||||||
|
throw new IllegalStateException("Installation is already in progress. Don't "
|
||||||
|
+ "commit session=" + sessionId + " again.");
|
||||||
|
}
|
||||||
|
mInstallationInProgress = true;
|
||||||
|
}
|
||||||
|
|
||||||
dispatchSessionSealed();
|
dispatchSessionSealed();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user