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

Merge "Avoid reverting apex on devices that do not support updating apex" into rvc-dev

Browse Source
This commit is contained in:
Mohammad Samiul Islam
2020-05-11 11:45:02 +00:00
committed by Android (Google) Code Review
parent 5681f3e796 5bf077de26
commit d8b6b0fb92
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/pm/StagingManager.java
View File

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