diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2014-11-18 10:38:22 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2014-11-18 11:38:01 -0800 |
commit | cf30da59e1468c90b14f5b909df9624cf4ee2b9a (patch) | |
tree | 0e612e8e82d3488f2d2e0f755297c3fb043c2454 | |
parent | 416541cc0e03ccd919d5669f0d06ef42a3b7ff21 (diff) | |
download | android_packages_apps_Trebuchet-cf30da59e1468c90b14f5b909df9624cf4ee2b9a.tar.gz android_packages_apps_Trebuchet-cf30da59e1468c90b14f5b909df9624cf4ee2b9a.tar.bz2 android_packages_apps_Trebuchet-cf30da59e1468c90b14f5b909df9624cf4ee2b9a.zip |
Clearing DB before restore starts.
Bug: 18362052
Change-Id: Ic4faf04db2f76c0c434907f1c41c8b708283eeb7
-rw-r--r-- | src/com/android/launcher3/LauncherBackupAgentHelper.java | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/com/android/launcher3/LauncherBackupAgentHelper.java b/src/com/android/launcher3/LauncherBackupAgentHelper.java index b03b13ccc..3868a57f1 100644 --- a/src/com/android/launcher3/LauncherBackupAgentHelper.java +++ b/src/com/android/launcher3/LauncherBackupAgentHelper.java @@ -69,13 +69,23 @@ public class LauncherBackupAgentHelper extends BackupAgentHelper { Log.d(TAG, "Restore is only supported on devices running Lollipop and above."); return; } - super.onRestore(data, appVersionCode, newState); - // If no favorite was migrated, clear the data and start fresh. - final Cursor c = getContentResolver().query( - LauncherSettings.Favorites.CONTENT_URI_NO_NOTIFICATION, null, null, null, null); - boolean hasData = c.moveToNext(); - c.close(); + // Clear dB before restore + LauncherAppState.getLauncherProvider().createEmptyDB(); + + boolean hasData; + try { + super.onRestore(data, appVersionCode, newState); + // If no favorite was migrated, clear the data and start fresh. + final Cursor c = getContentResolver().query( + LauncherSettings.Favorites.CONTENT_URI_NO_NOTIFICATION, null, null, null, null); + hasData = c.moveToNext(); + c.close(); + } catch (Exception e) { + // If the restore fails, we should do a fresh start. + Log.e(TAG, "Restore failed", e); + hasData = false; + } if (hasData && mHelper.restoreSuccessful) { LauncherAppState.getLauncherProvider().clearFlagEmptyDbCreated(); |