diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2014-10-16 09:24:19 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2014-10-28 09:27:10 -0700 |
commit | 33d443897658e6ad8b76bd2e58e3598161fd3ead (patch) | |
tree | 2205d9f2b6c9ce04a1fbb47495b45eae04345a11 /src/com/android/launcher3/LauncherProvider.java | |
parent | 09ae4aef52b4486b97ecc77feeb64307bcbd3993 (diff) | |
download | android_packages_apps_Trebuchet-33d443897658e6ad8b76bd2e58e3598161fd3ead.tar.gz android_packages_apps_Trebuchet-33d443897658e6ad8b76bd2e58e3598161fd3ead.tar.bz2 android_packages_apps_Trebuchet-33d443897658e6ad8b76bd2e58e3598161fd3ead.zip |
Updating backup restore logic
> Adding DeviceProfile information in the backup
> Removing SharedPreference backup
> Adding helper methods to abort backup in the middle
> Comparing keys against the backup journal during restore
to avoid restoring corrupt/lost entries
> Old backups are still compatible, but lost keys verification
will be ignored in that case.
Bug: 17937935
Bug: 17951775
Bug: 17260941
Change-Id: Iad48646cfdd69abaff5c163b2055f3b8a9b39b19
Diffstat (limited to 'src/com/android/launcher3/LauncherProvider.java')
-rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index fe9bc171f..365d989bf 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -293,6 +293,14 @@ public class LauncherProvider extends ContentProvider { mOpenHelper.createEmptyDB(mOpenHelper.getWritableDatabase()); } + public void clearFlagEmptyDbCreated() { + String spKey = LauncherAppState.getSharedPreferencesKey(); + getContext().getSharedPreferences(spKey, Context.MODE_PRIVATE) + .edit() + .remove(EMPTY_DATABASE_CREATED) + .commit(); + } + /** * Loads the default workspace based on the following priority scheme: * 1) From a package provided by play store @@ -334,7 +342,7 @@ public class LauncherProvider extends ContentProvider { mOpenHelper.loadFavorites(mOpenHelper.getWritableDatabase(), getDefaultLayoutParser()); } - sp.edit().remove(EMPTY_DATABASE_CREATED).commit(); + clearFlagEmptyDbCreated(); } } |