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

Merge "delete ENABLING rollback if we can't get session info for it."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-07-03 12:23:36 +00:00
committed by Android (Google) Code Review
parent 9e2a8e9678 ded86e4aae
commit 2d6b238ea3
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
View File

@@ -648,17 +648,14 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
PackageInstaller installer = mContext.getPackageManager().getPackageInstaller();
PackageInstaller.SessionInfo session = installer.getSessionInfo(
data.stagedSessionId);
// TODO: What if session is null?
if (session != null) {
if (session.isStagedSessionApplied()) {
makeRollbackAvailable(data);
} else if (session.isStagedSessionFailed()) {
// TODO: Do we need to remove this from
// mRollbacks, or is it okay to leave as
// unavailable until the next reboot when it will go
// away on its own?
deleteRollback(data);
}
if (session == null || session.isStagedSessionFailed()) {
// TODO: Do we need to remove this from
// mRollbacks, or is it okay to leave as
// unavailable until the next reboot when it will go
// away on its own?
deleteRollback(data);
} else if (session.isStagedSessionApplied()) {
makeRollbackAvailable(data);
}
}