Merge "delete ENABLING rollback if we can't get session info for it." (2d6b238e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java

+8 −11

Original line number	Diff line number	Diff line
		@@ -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()) {
		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);
		}
		}