diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2014-11-18 10:38:22 -0800 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2015-09-27 21:06:03 -0700 |
commit | 28d42e88a7d6abdeb6f8da0fe291cd7fb7bc5679 (patch) | |
tree | fb3a6556f1802b022948223a17a5478cdc7186c5 /src/com/android | |
parent | 2bf24b39f00df7fe9d0025ebb3c9a0017d886331 (diff) | |
download | android_packages_apps_Trebuchet-28d42e88a7d6abdeb6f8da0fe291cd7fb7bc5679.tar.gz android_packages_apps_Trebuchet-28d42e88a7d6abdeb6f8da0fe291cd7fb7bc5679.tar.bz2 android_packages_apps_Trebuchet-28d42e88a7d6abdeb6f8da0fe291cd7fb7bc5679.zip |
Clearing DB before restore starts.
Bug: 18362052
Change-Id: Ic4faf04db2f76c0c434907f1c41c8b708283eeb7
Diffstat (limited to 'src/com/android')
-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(); |