diff options
author | Adam Cohen <adamcohen@google.com> | 2014-11-18 20:05:07 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-18 20:05:08 +0000 |
commit | 7c39e2380f3406f897b2f0abffcb8267d2212482 (patch) | |
tree | 7c1b7d816bce02dc24f14ee5d6c5fe23fe9f110d | |
parent | c7cd2cb28f0d08dd47c79007794fc37036210b6a (diff) | |
parent | cf30da59e1468c90b14f5b909df9624cf4ee2b9a (diff) | |
download | android_packages_apps_Trebuchet-7c39e2380f3406f897b2f0abffcb8267d2212482.tar.gz android_packages_apps_Trebuchet-7c39e2380f3406f897b2f0abffcb8267d2212482.tar.bz2 android_packages_apps_Trebuchet-7c39e2380f3406f897b2f0abffcb8267d2212482.zip |
Merge "Clearing DB before restore starts." into ub-now-queens
-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(); |