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

Merge "Log only a summary 'Found stale backup journal' message." am: 00cf543f53

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

Change-Id: I009759300b8e5cf7943ef32732773889f04e6a72
This commit is contained in:
Tom Cherry
2020-07-27 18:34:01 +00:00
committed by Automerger Merge Worker
parent 3c8639d035 00cf543f53
commit 24b9cf1e8f
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
services/backup/java/com/android/server/backup/UserBackupManagerService.java
View File

@@ -156,6 +156,7 @@ import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Queue; import java.util.Queue;
@@ -1084,19 +1085,31 @@ public class UserBackupManagerService {
private void parseLeftoverJournals() { private void parseLeftoverJournals() {
ArrayList<DataChangedJournal> journals = DataChangedJournal.listJournals(mJournalDir); 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, "Found " + journals.size() + " stale backup journal(s), scheduling.");
}
Set<String> packageNames = new LinkedHashSet<>();
for (DataChangedJournal journal : journals) { for (DataChangedJournal journal : journals) {
if (!journal.equals(mJournal)) { try {
try { journal.forEach(packageName -> {
journal.forEach(packageName -> { if (packageNames.add(packageName)) {
Slog.i(TAG, "Found stale backup journal, scheduling");
if (MORE_DEBUG) Slog.i(TAG, " " + packageName);
dataChangedImpl(packageName); dataChangedImpl(packageName);
}); }
} catch (IOException e) { });
Slog.e(TAG, "Can't read " + journal, e); } catch (IOException e) {
} Slog.e(TAG, "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, msg);
}
} }
/** Used for generating random salts or passwords. */ /** Used for generating random salts or passwords. */