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

Commit c0ee675f authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Avoiding writing the Metadata in the backup if nothing was changed in the backup 

Change-Id: I4608ab5511b01f0d0018596d68e4341635649f73
parent 08f7261d

src/com/android/launcher3/LauncherBackupAgentHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ public class LauncherBackupAgentHelper extends BackupAgentHelper { 


    private static final String LAUNCHER_DATA_PREFIX = "L";



    static final boolean VERBOSE = true;

    static final boolean VERBOSE = false;

    static final boolean DEBUG = false;



    private static BackupManager sBackupManager;

src/com/android/launcher3/LauncherBackupHelper.java

+24 −8
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import java.io.FileOutputStream; 
import java.io.IOException;

import java.net.URISyntaxException;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.HashMap;

import java.util.HashSet;

import java.util.zip.CRC32;
@@ -140,9 +141,9 @@ public class LauncherBackupHelper implements BackupHelper { 


    private IconCache mIconCache;

    private BackupManager mBackupManager;

    private HashMap<ComponentName, AppWidgetProviderInfo> mWidgetMap;

    private byte[] mBuffer = new byte[512];

    private long mLastBackupRestoreTime;

    private boolean mBackupDataWasUpdated;



    private DeviceProfieData mCurrentProfile;

    boolean restoreSuccessful;
@@ -201,7 +202,7 @@ public class LauncherBackupHelper implements BackupHelper { 
        // Record the time before performing backup so that entries edited while the backup

        // was going on, do not get missed in next backup.

        long newBackupTime = System.currentTimeMillis();



        mBackupDataWasUpdated = false;

        try {

            backupFavorites(data);

            backupScreens(data);
@@ -219,9 +220,20 @@ public class LauncherBackupHelper implements BackupHelper { 
            for (String deleted: mExistingKeys) {

                if (VERBOSE) Log.v(TAG, "dropping deleted item " + deleted);

                data.writeEntityHeader(deleted, -1);

                mBackupDataWasUpdated = true;

            }



            mExistingKeys.clear();

            if (!mBackupDataWasUpdated) {

                // Check if any metadata has changed

                mBackupDataWasUpdated = (in.profile == null)

                        || !Arrays.equals(DeviceProfieData.toByteArray(in.profile),

                            DeviceProfieData.toByteArray(getDeviceProfieData()))

                        || (in.backupVersion != BACKUP_VERSION)

                        || (in.appVersion != getAppVersion());

            }



            if (mBackupDataWasUpdated) {

                mLastBackupRestoreTime = newBackupTime;



                // We store the journal at two places.
@@ -229,6 +241,9 @@ public class LauncherBackupHelper implements BackupHelper { 
                //   2) Storing it in backup data allows us to validate keys during restore

                Journal state = getCurrentStateJournal();

                writeRowToBackup(JOURNAL_KEY, state, data);

            } else {

                if (DEBUG) Log.d(TAG, "Nothing was written during backup");

            }

        } catch (IOException e) {

            Log.e(TAG, "launcher backup has failed", e);

        }
@@ -1020,6 +1035,7 @@ public class LauncherBackupHelper implements BackupHelper { 
        byte[] blob = writeCheckedBytes(proto);

        data.writeEntityHeader(backupKey, blob.length);

        data.writeEntityData(blob, blob.length);

        mBackupDataWasUpdated = true;

        if (VERBOSE) Log.v(TAG, "Writing New entry " + backupKey);

    }