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

Commit 62683142 authored by Alexei Nicoara's avatar Alexei Nicoara
Browse files

Don't crash when there is no rollback dir 

This can happen if init failed to create the rollback folder

Bug: 383969369
Change-Id: I9ea7700ee42ac0bf462a27981483ed2f6b480d54
Test: presubmit
Flag: EXEMPT minor bugfix
parent 7b641717

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