Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a226197d authored by Alexei Nicoara's avatar Alexei Nicoara Committed by Automerger Merge Worker
Browse files

Merge "Don't crash when there is no rollback dir" into main am: b33558c1 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3421899



Change-Id: Ie293aa13a4d93dbc96b1492adfab2d28f36b3cbf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a87219f0 b33558c1

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

+6 −2
Original line number Diff line number Diff line
@@ -84,8 +84,12 @@ class RollbackStore { 
     */

    private static List<Rollback> loadRollbacks(File rollbackDataDir) {

        List<Rollback> rollbacks = new ArrayList<>();

        rollbackDataDir.mkdirs();

        for (File rollbackDir : rollbackDataDir.listFiles()) {

        File[] rollbackDirs = rollbackDataDir.listFiles();

        if (rollbackDirs == null) {

            Slog.e(TAG, "Folder doesn't exist: " + rollbackDataDir);

            return rollbacks;

        }

        for (File rollbackDir : rollbackDirs) {

            if (rollbackDir.isDirectory()) {

                try {

                    rollbacks.add(loadRollback(rollbackDir));