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

Merge "Always restore staged sessions on boot." into qt-dev

Browse Source
This commit is contained in:
Dario Freni
2019-05-09 15:19:58 +00:00
committed by Android (Google) Code Review
parent 52ce3686f9 f2449f7c5c
commit f3c1480ea7
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/pm/PackageInstallerService.java
View File

@@ -363,8 +363,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
System.currentTimeMillis() - session.getUpdatedMillis();
final boolean valid;
if (session.isStaged()) {
if (timeSinceUpdate >= MAX_TIME_SINCE_UPDATE_MILLIS
&& session.isStagedAndInTerminalState()) {
if (timeSinceUpdate >= MAX_TIME_SINCE_UPDATE_MILLIS) {
valid = false;
} else {
valid = true;

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

@@ -1150,7 +1150,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
*/
void sealAndValidateIfNecessary() {
synchronized (mLock) {
if (!mShouldBeSealed) {
if (!mShouldBeSealed || isStagedAndInTerminalState()) {
return;
}
}