diff options
| -rw-r--r-- | services/backup/java/com/android/server/backup/ProcessedPackagesJournal.java | 6 | ||||
| -rw-r--r-- | services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java | 13 |
2 files changed, 12 insertions, 7 deletions
diff --git a/services/backup/java/com/android/server/backup/ProcessedPackagesJournal.java b/services/backup/java/com/android/server/backup/ProcessedPackagesJournal.java index 187d5d93bfdd..e29b7d58e018 100644 --- a/services/backup/java/com/android/server/backup/ProcessedPackagesJournal.java +++ b/services/backup/java/com/android/server/backup/ProcessedPackagesJournal.java @@ -21,7 +21,10 @@ import android.util.Slog; import com.android.internal.annotations.GuardedBy; import com.android.server.backup.RefactoredBackupManagerService; +import java.io.BufferedInputStream; +import java.io.DataInputStream; import java.io.EOFException; +import java.io.FileInputStream; import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; @@ -130,7 +133,8 @@ final class ProcessedPackagesJournal { return; } - try (RandomAccessFile oldJournal = new RandomAccessFile(journalFile, "r")) { + try (DataInputStream oldJournal = new DataInputStream( + new BufferedInputStream(new FileInputStream(journalFile)))) { while (true) { String packageName = oldJournal.readUTF(); if (DEBUG) { diff --git a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java b/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java index da0827cc97a4..8b4cc7f6d22b 100644 --- a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java +++ b/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java @@ -832,17 +832,18 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter // Remember our ancestral dataset mTokenFile = new File(mBaseStateDir, "ancestral"); - try (RandomAccessFile tf = new RandomAccessFile(mTokenFile, "r")) { - int version = tf.readInt(); + try (DataInputStream tokenStream = new DataInputStream(new BufferedInputStream( + new FileInputStream(mTokenFile)))) { + int version = tokenStream.readInt(); if (version == CURRENT_ANCESTRAL_RECORD_VERSION) { - mAncestralToken = tf.readLong(); - mCurrentToken = tf.readLong(); + mAncestralToken = tokenStream.readLong(); + mCurrentToken = tokenStream.readLong(); - int numPackages = tf.readInt(); + int numPackages = tokenStream.readInt(); if (numPackages >= 0) { mAncestralPackages = new HashSet<>(); for (int i = 0; i < numPackages; i++) { - String pkgName = tf.readUTF(); + String pkgName = tokenStream.readUTF(); mAncestralPackages.add(pkgName); } } |