Merge "Avoid reverting apex on devices that do not support updating apex" into rvc-dev (d8b6b0fb) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/StagingManager.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -354,13 +354,19 @@ public class StagingManager {
		Slog.e(TAG, "Aborting checkpoint: " + errorMsg);
		try {
		if (supportsCheckpoint() && needsCheckpoint()) {
		// Only revert apex sessions if device supports updating apex
		if (mApexManager.isApexSupported()) {
		mApexManager.revertActiveSessions();
		}
		PackageHelper.getStorageManager().abortChanges(
		"StagingManager initiated", false /retry/);
		}
		} catch (Exception e) {
		Slog.wtf(TAG, "Failed to abort checkpoint", e);
		// Only revert apex sessions if device supports updating apex
		if (mApexManager.isApexSupported()) {
		mApexManager.revertActiveSessions();
		}
		mPowerManager.reboot(null);
		}
		}