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

Commit dd64d794 authored by Tom Cherry's avatar Tom Cherry Committed by Automerger Merge Worker
Browse files

Log only a summary 'Found stale backup journal' message. am: 4b4e7819 am: 2ae5c540 

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

Change-Id: I47e5638db690847ba56c465f53d5d63095c4e609
parents d488faa2 2ae5c540

services/backup/java/com/android/server/backup/UserBackupManagerService.java

+23 −14
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ import java.util.Collections; 
import java.util.Date;

import java.util.HashMap;

import java.util.HashSet;

import java.util.LinkedHashSet;

import java.util.LinkedList;

import java.util.List;

import java.util.Objects;
@@ -1109,23 +1110,31 @@ public class UserBackupManagerService { 


    private void parseLeftoverJournals() {

        ArrayList<DataChangedJournal> journals = DataChangedJournal.listJournals(mJournalDir);

        // TODO(b/162022005): Fix DataChangedJournal implementing equals() but not hashCode().

        journals.removeAll(Collections.singletonList(mJournal));

        if (!journals.isEmpty()) {

            Slog.i(TAG, addUserIdToLogMessage(mUserId,

                    "Found " + journals.size() + " stale backup journal(s), scheduling."));

        }

        Set<String> packageNames = new LinkedHashSet<>();

        for (DataChangedJournal journal : journals) {

            if (!journal.equals(mJournal)) {

            try {

                journal.forEach(packageName -> {

                        Slog.i(

                                TAG,

                                addUserIdToLogMessage(

                                        mUserId, "Found stale backup journal, scheduling"));

                        if (MORE_DEBUG) {

                            Slog.i(TAG, addUserIdToLogMessage(mUserId, "  " + packageName));

                        }

                    if (packageNames.add(packageName)) {

                        dataChangedImpl(packageName);

                    }

                });

            } catch (IOException e) {

                Slog.e(TAG, addUserIdToLogMessage(mUserId, "Can't read " + journal), e);

            }

        }

        if (!packageNames.isEmpty()) {

            String msg = "Stale backup journals: Scheduled " + packageNames.size()

                    + " package(s) total";

            if (MORE_DEBUG) {

                msg += ": " + packageNames;

            }

            Slog.i(TAG, addUserIdToLogMessage(mUserId, msg));

        }

    }