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

Commit 4b10d202 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 am: a226197d 

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



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

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));