diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-09-26 22:09:29 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2014-09-28 17:02:03 -0700 |
| commit | 42de82ff8d2aa182594709e63e608bbcd4610cfa (patch) | |
| tree | 3703c2ba41ae50491ea79819efd27fe38aadbf05 /src/com/android/launcher3/LauncherBackupHelper.java | |
| parent | c5fb59fb9a36180ce962f565d85aa92f9991da1a (diff) | |
| download | android_packages_apps_Trebuchet-42de82ff8d2aa182594709e63e608bbcd4610cfa.tar.gz android_packages_apps_Trebuchet-42de82ff8d2aa182594709e63e608bbcd4610cfa.tar.bz2 android_packages_apps_Trebuchet-42de82ff8d2aa182594709e63e608bbcd4610cfa.zip | |
Resetting launcherProvider data if restore set was empty
Bug: 17332300
Change-Id: I6d2187cd1b1fa7a53e49b96eb109263f6b74b258
Diffstat (limited to 'src/com/android/launcher3/LauncherBackupHelper.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherBackupHelper.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java index 911a41dca..201f3e9bb 100644 --- a/src/com/android/launcher3/LauncherBackupHelper.java +++ b/src/com/android/launcher3/LauncherBackupHelper.java @@ -148,11 +148,12 @@ public class LauncherBackupHelper implements BackupHelper { private HashMap<ComponentName, AppWidgetProviderInfo> mWidgetMap; - private ArrayList<Key> mKeys; + private final ArrayList<Key> mKeys; public LauncherBackupHelper(Context context, boolean restoreEnabled) { mContext = context; mRestoreEnabled = restoreEnabled; + mKeys = new ArrayList<Key>(); } private void dataChanged() { @@ -218,9 +219,6 @@ public class LauncherBackupHelper implements BackupHelper { @Override public void restoreEntity(BackupDataInputStream data) { if (VERBOSE) Log.v(TAG, "restoreEntity"); - if (mKeys == null) { - mKeys = new ArrayList<Key>(); - } byte[] buffer = new byte[512]; String backupKey = data.getKey(); int dataSize = data.size(); |