Merge changes I4d020811,I4aeda1f2 (339405fc) · Commits · e / os / android_frameworks_base

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

+19 −20

Original line number	Diff line number	Diff line
		@@ -869,14 +869,6 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
		return false;
		}

		ApplicationInfo appInfo = pkgInfo.applicationInfo;
		boolean success = rollback.enableForPackage(packageName, newPackage.versionCode,
		pkgInfo.getLongVersionCode(), isApex, appInfo.sourceDir,
		appInfo.splitSourceDirs, session.rollbackDataPolicy);
		if (!success) {
		return success;
		}

		if (isApex) {
		// Check if this apex contains apks inside it. If true, then they should be added as
		// a RollbackPackageInfo into this rollback
		@@ -894,12 +886,24 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
		Slog.e(TAG, apkInApex + " is not installed");
		return false;
		}
		success = rollback.enableForPackageInApex(
		apkInApex, apkPkgInfo.getLongVersionCode(), session.rollbackDataPolicy);
		if (!success) return success;
		if (!rollback.enableForPackageInApex(
		apkInApex, apkPkgInfo.getLongVersionCode(), session.rollbackDataPolicy)) {
		return false;
		}
		}
		return true;
		}

		/**
		* The order is important here! Always enable the embedded apk-in-apex (if any) before
		* enabling the embedding apex. Otherwise the rollback object might be in an inconsistent
		* state where an embedding apex is successfully enabled while one of its embedded
		* apk-in-apex failed. Note {@link Rollback#allPackagesEnabled()} won't behave correctly if
		* a rollback object is inconsistent because it doesn't count apk-in-apex.
		*/
		ApplicationInfo appInfo = pkgInfo.applicationInfo;
		return rollback.enableForPackage(packageName, newPackage.versionCode,
		pkgInfo.getLongVersionCode(), isApex, appInfo.sourceDir,
		appInfo.splitSourceDirs, session.rollbackDataPolicy);
		}

		@Override
		@@ -982,8 +986,6 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
		if (!session.isMultiPackage()) {
		if (!enableRollbackForPackageSession(newRollback, session)) {
		Slog.e(TAG, "Unable to enable rollback for session: " + sessionId);
		result.offer(-1);
		return;
		}
		} else {
		for (int childSessionId : session.getChildSessionIds()) {
		@@ -991,13 +993,11 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
		installer.getSessionInfo(childSessionId);
		if (childSession == null) {
		Slog.e(TAG, "No matching child install session for: " + childSessionId);
		result.offer(-1);
		return;
		break;
		}
		if (!enableRollbackForPackageSession(newRollback, childSession)) {
		Slog.e(TAG, "Unable to enable rollback for session: " + sessionId);
		result.offer(-1);
		return;
		break;
		}
		}
		}
		@@ -1188,8 +1188,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
		}

		/**
		* Add a rollback to the list of rollbacks. This should be called after rollback has been
		* enabled for all packages in the rollback. It does not make the rollback available yet.
		* Add a rollback to the list of rollbacks. It does not make the rollback available yet.
		*
		* @return the Rollback instance for a successfully enable-completed rollback,
		* or null on error.