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

Commit 0a809733 authored by Ed Heyl's avatar Ed Heyl
Browse files

Fix build: Revert "Properly set up local transport data dirs after an initialize operation" 

This reverts commit dc205b3f.

Change-Id: I6ed27c1eb8ddd1894bf0374b989a1b4e3d7761a3
parent dc205b3f

core/java/com/android/internal/backup/LocalTransport.java

+7 −9
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ public class LocalTransport extends BackupTransport { 
    private File mRestoreSetDir;

    private File mRestoreSetIncrementalDir;

    private File mRestoreSetFullDir;

    private long mRestoreToken;



    // Additional bookkeeping for full backup

    private String mFullTargetPackage;
@@ -92,22 +93,20 @@ public class LocalTransport extends BackupTransport { 
    private BufferedOutputStream mFullBackupOutputStream;

    private byte[] mFullBackupBuffer;



    private File mFullRestoreSetDir;

    private HashSet<String> mFullRestorePackages;

    private FileInputStream mCurFullRestoreStream;

    private FileOutputStream mFullRestoreSocketStream;

    private byte[] mFullRestoreBuffer;



    private void makeDataDirs() {

    public LocalTransport(Context context) {

        mContext = context;

        mCurrentSetDir.mkdirs();

        if (!SELinux.restorecon(mCurrentSetDir)) {

            Log.e(TAG, "SELinux restorecon failed for " + mCurrentSetDir);

        }

        mCurrentSetFullDir.mkdir();

        mCurrentSetIncrementalDir.mkdir();

        if (!SELinux.restorecon(mCurrentSetDir)) {

            Log.e(TAG, "SELinux restorecon failed for " + mCurrentSetDir);

        }



    public LocalTransport(Context context) {

        mContext = context;

        makeDataDirs();

    }



    @Override
@@ -152,7 +151,6 @@ public class LocalTransport extends BackupTransport { 
    public int initializeDevice() {

        if (DEBUG) Log.v(TAG, "wiping all data");

        deleteContents(mCurrentSetDir);

        makeDataDirs();

        return TRANSPORT_OK;

    }