Merge "[RefactoredBMS] Use buffered DataInputStream vs RandomAccessFile"

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;

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

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

                    }

                }